undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mz/doc-rebase-abort' into maint

Browse Source 
* mz/doc-rebase-abort:
  rebase: clarify "restore the original branch"
This commit is contained in:
Junio C Hamano 2011-08-16 11:41:28 -07:00
commit b5e104a0e6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-rebase.txt
View File

@ -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 It is possible that a merge failure will prevent this process from being
completely automatic. You will have to resolve any such merge failure completely automatic. You will have to resolve any such merge failure
and run `git rebase --continue`. Another option is to bypass the commit 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 original <branch> and remove the .git/rebase-apply working files, use the
command `git rebase --abort` instead. 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. Restart the rebasing process after having resolved a merge conflict.
--abort:: --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:: --skip::
Restart the rebasing process by skipping the current patch. Restart the rebasing process by skipping the current patch.

10
git-rebase.sh
View File

@ -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 It is possible that a merge failure will prevent this process from being
completely automatic. You will have to resolve any such merge failure completely automatic. You will have to resolve any such merge failure
and run git rebase --continue. Another option is to bypass the commit 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 original <branch> and remove the .git/rebase-apply working files, use the
command git rebase --abort instead. command git rebase --abort instead.
@ -57,9 +57,9 @@ whitespace=! passed to 'git apply'
ignore-whitespace! passed to 'git apply' ignore-whitespace! passed to 'git apply'
C=! passed to 'git apply' C=! passed to 'git apply'
Actions: Actions:
continue! continue rebasing process continue! continue
abort! abort rebasing process and restore original branch abort! abort and check out the original branch
skip! skip current patch and continue rebasing process skip! skip current patch and continue
" "
. git-sh-setup . git-sh-setup
set_reflog_action rebase set_reflog_action rebase
@ -72,7 +72,7 @@ ok_to_skip_pre_rebase=
resolvemsg=" resolvemsg="
When you have resolved this problem run \"git rebase --continue\". When you have resolved this problem run \"git rebase --continue\".
If you would prefer to skip this patch, instead run \"git rebase --skip\". 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 unset onto
strategy= strategy=