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=--cc

Merge branch 'rr/rebase-autostash'

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

c8686e510fa56d3e8349ec3ca83215a107d47d45
diff --cc 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