From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Jul 2013 19:38:29 +0000 (-0700)
Subject: Merge branch 'rr/rebase-autostash'
X-Git-Tag: v1.8.4-rc1~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c8686e510fa56d3e8349ec3ca83215a107d47d45?ds=inline;hp=-c

Merge branch 'rr/rebase-autostash'

* rr/rebase-autostash:
git-rebase: fix typo
---

c8686e510fa56d3e8349ec3ca83215a107d47d45
diff --combined git-rebase.sh
index 0039ecfb40,a28209daba..8d7659a22c
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@@ -155,11 -155,14 +155,11 @@@ finish_rebase () 
  		then
  			echo "$(gettext 'Applied autostash.')"
  		else
 -			ref_stash=refs/stash &&
 -			>>"$GIT_DIR/logs/$ref_stash" &&
 -			git update-ref -m "autostash" $ref_stash $stash_sha1 ||
 -			die "$(eval_gettext 'Cannot store $stash_sha1')"
 -
 +			git stash store -m "autostash" -q $stash_sha1 ||
 +			die "$(eval_gettext "Cannot store \$stash_sha1")"
  			gettext 'Applying autostash resulted in conflicts.
  Your changes are safe in the stash.
- You can run "git stash pop" or "git stash drop" it at any time.
+ You can run "git stash pop" or "git stash drop" at any time.
  '
  		fi
  	fi
@@@ -433,7 -436,7 +433,7 @@@ the
  		shift
  		;;
  	esac
 -	upstream=`git rev-parse --verify "${upstream_name}^0"` ||
 +	upstream=$(peel_committish "${upstream_name}") ||
  	die "$(eval_gettext "invalid upstream \$upstream_name")"
  	upstream_arg="$upstream_name"
  else
@@@ -469,7 -472,7 +469,7 @@@ case "$onto_name" i
  	fi
  	;;
  *)
 -	onto=$(git rev-parse --verify "${onto_name}^0") ||
 +	onto=$(peel_committish "$onto_name") ||
  	die "$(eval_gettext "Does not point to a valid commit: \$onto_name")"
  	;;
  esac
@@@ -542,9 -545,7 +542,9 @@@ the
  	if test -z "$force_rebase"
  	then
  		# Lazily switch to the target branch if needed...
 -		test -z "$switch_to" || git checkout "$switch_to" --
 +		test -z "$switch_to" ||
 +		GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \
 +			git checkout "$switch_to" --
  		say "$(eval_gettext "Current branch \$branch_name is up to date.")"
  		finish_rebase
  		exit 0
@@@ -570,9 -571,7 +570,9 @@@ test "$type" = interactive && run_speci
  
  # Detach HEAD and reset the tree
  say "$(gettext "First, rewinding head to replay your work on top of it...")"
 -git checkout -q "$onto^0" || die "could not detach HEAD"
 +
 +GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" \
 +	git checkout -q "$onto^0" || die "could not detach HEAD"
  git update-ref ORIG_HEAD $orig_head
  
  # If the $onto is a proper descendant of the tip of the branch, then