From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Jul 2011 21:44:08 +0000 (-0700)
Subject: Merge branch 'mz/doc-rebase-abort'
X-Git-Tag: v1.7.7-rc0~74
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f424d7e0b91372d98047850aa083a5e397eed57c?hp=-c

Merge branch 'mz/doc-rebase-abort'

* mz/doc-rebase-abort:
rebase: clarify "restore the original branch"
---

f424d7e0b91372d98047850aa083a5e397eed57c
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
  	[<upstream>] [<branch>]
  'git rebase' [-i | --interactive] [options] --onto <newbase>
  	--root [<branch>]
 -
  '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 <branch> 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 <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 --combined git-rebase.sh
index 4761f28890,38cbee7dce..266a4c13bb
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -13,7 -13,7 +13,7 @@@ It then attempts to create a new commi
  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 +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 +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=
@@@ -441,7 -441,8 +441,7 @@@ case "$#" i
  	then
  		head_name="detached HEAD"
  	else
 -		echo >&2 "fatal: no such branch: $1"
 -		usage
 +		die "fatal: no such branch: $1"
  	fi
  	;;
  *)