From: Junio C Hamano Date: Tue, 16 Aug 2011 18:41:28 +0000 (-0700) Subject: Merge branch 'mz/doc-rebase-abort' into maint X-Git-Tag: v1.7.6.1~21 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b5e104a0e69f224b89a849fa1e9b4064a36c2f4b?hp=-c Merge branch 'mz/doc-rebase-abort' into maint * mz/doc-rebase-abort: rebase: clarify "restore the original branch" --- b5e104a0e69f224b89a849fa1e9b4064a36c2f4b diff --combined Documentation/git-rebase.txt index a9e0e503cb,952859f40a..504945c691 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@@ -12,6 -12,7 +12,6 @@@ SYNOPSI [] [] 'git rebase' [-i | --interactive] [options] --onto --root [] - 'git rebase' --continue | --skip | --abort DESCRIPTION @@@ -45,7 -46,7 +45,7 @@@ with a different commit message or time It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit - that caused the merge failure with `git rebase --skip`. To restore the + that caused the merge failure with `git rebase --skip`. To check out the original and remove the .git/rebase-apply working files, use the command `git rebase --abort` instead. @@@ -232,7 -233,11 +232,11 @@@ leave out at most one of A and B, in wh Restart the rebasing process after having resolved a merge conflict. --abort:: - Restore the original branch and abort the rebase operation. + Abort the rebase operation and reset HEAD to the original + branch. If was provided when the rebase operation was + started, then HEAD will be reset to . Otherwise HEAD + will be reset to where it was when the rebase operation was + started. --skip:: Restart the rebasing process by skipping the current patch.