summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-16 18:41:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-16 18:41:28 (GMT)
commitb5e104a0e69f224b89a849fa1e9b4064a36c2f4b (patch)
tree20452ad8f672fccb4fe71b01e575934061405e85
parent22d9b7937054c90aea035afee8ebfa90bba2f7f9 (diff)
parent5960bc9d63c2cd9dc7eb9d44f470d516579f1bd6 (diff)
downloadgit-b5e104a0e69f224b89a849fa1e9b4064a36c2f4b.zip
git-b5e104a0e69f224b89a849fa1e9b4064a36c2f4b.tar.gz
git-b5e104a0e69f224b89a849fa1e9b4064a36c2f4b.tar.bz2
Merge branch 'mz/doc-rebase-abort' into maint
* mz/doc-rebase-abort: rebase: clarify "restore the original branch"
-rw-r--r--Documentation/git-rebase.txt8
-rwxr-xr-xgit-rebase.sh10
2 files changed, 11 insertions, 7 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index a9e0e50..504945c 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.
diff --git a/git-rebase.sh b/git-rebase.sh
index d7855ea..38cbee7 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=