Merge branch 'nd/rebase-forget'
"git rebase" learned "--quit" option, which allows a user to remove the metadata left by an earlier "git rebase" that was manually aborted without using "git rebase --abort". * nd/rebase-forget: rebase: add --quit to cleanup rebase, leave everything else untouched
This commit is contained in:
@ -12,7 +12,7 @@ SYNOPSIS
|
||||
[<upstream> [<branch>]]
|
||||
'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>]
|
||||
--root [<branch>]
|
||||
'git rebase' --continue | --skip | --abort | --edit-todo
|
||||
'git rebase' --continue | --skip | --abort | --quit | --edit-todo
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
@ -252,6 +252,11 @@ leave out at most one of A and B, in which case it defaults to HEAD.
|
||||
will be reset to where it was when the rebase operation was
|
||||
started.
|
||||
|
||||
--quit::
|
||||
Abort the rebase operation but HEAD is not reset back to the
|
||||
original branch. The index and working tree are also left
|
||||
unchanged as a result.
|
||||
|
||||
--keep-empty::
|
||||
Keep the commits that do not change anything from its
|
||||
parents in the result.
|
||||
|
Reference in New Issue
Block a user