diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:41:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:41:28 -0700 |
commit | b5e104a0e69f224b89a849fa1e9b4064a36c2f4b (patch) | |
tree | 20452ad8f672fccb4fe71b01e575934061405e85 /Documentation | |
parent | Merge branch 'bw/log-all-ref-updates-doc' into maint (diff) | |
parent | rebase: clarify "restore the original branch" (diff) | |
download | tgif-b5e104a0e69f224b89a849fa1e9b4064a36c2f4b.tar.xz |
Merge branch 'mz/doc-rebase-abort' into maint
* mz/doc-rebase-abort:
rebase: clarify "restore the original branch"
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-rebase.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index a9e0e503cb..504945c691 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -45,7 +45,7 @@ with a different commit message or timestamp will be skipped). 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 <branch> and remove the .git/rebase-apply working files, use the command `git rebase --abort` instead. @@ -232,7 +232,11 @@ leave out at most one of A and B, in which case it defaults to HEAD. 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 <branch> was provided when the rebase operation was + started, then HEAD will be reset to <branch>. 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. |