Merge branch 'rr/rebase-autostash'

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

diff --cc git-rebase.sh
index 0039ecfb407960444c31d48767b65cf773a3243a,a28209daba69d085070535393ae9b29dc74b909d..8d7659a22c253b9f9535aee38e3bf0ce380cef75
--- 1/git-rebase.sh
--- 2/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