diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-07-13 23:47:06 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-13 22:03:12 -0700 |
| commit | 5960bc9d63c2cd9dc7eb9d44f470d516579f1bd6 (patch) | |
| tree | 5cc29a3e85c68ed4ec0b4e0a7ce789dc1dc853f3 /git-rebase.sh | |
| parent | d28790dc31ca1bcdca7254a6b9381b6c84e91271 (diff) | |
| download | git-5960bc9d63c2cd9dc7eb9d44f470d516579f1bd6.tar.gz | |
rebase: clarify "restore the original branch"
The description for 'git rebase --abort' currently says:
Restore the original branch and abort the rebase operation.
The "restore" can be misinterpreted to imply that the original branch
was somehow in a broken state during the rebase operation. It is also
not completely clear what "the original branch" is --- is it the
branch that was checked out before the rebase operation was called or
is the the branch that is being rebased (it is the latter)? Although
both issues are made clear in the DESCRIPTION section, let us also
make the entry in the OPTIONS secion more clear.
Also remove the term "rebasing process" from the usage text, since the
user already knows that the text is about "git rebase".
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index d7855ea1c6..38cbee7dce 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -13,7 +13,7 @@ It then attempts to create a new commit for each commit from the original 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. @@ -57,9 +57,9 @@ whitespace=! passed to 'git apply' ignore-whitespace! passed to 'git apply' C=! passed to 'git apply' Actions: -continue! continue rebasing process -abort! abort rebasing process and restore original branch -skip! skip current patch and continue rebasing process +continue! continue +abort! abort and check out the original branch +skip! skip current patch and continue " . git-sh-setup set_reflog_action rebase @@ -72,7 +72,7 @@ ok_to_skip_pre_rebase= resolvemsg=" When you have resolved this problem run \"git rebase --continue\". If you would prefer to skip this patch, instead run \"git rebase --skip\". -To restore the original branch and stop rebasing run \"git rebase --abort\". +To check out the original branch and stop rebasing run \"git rebase --abort\". " unset onto strategy= |