Commit c8686e51 authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'rr/rebase-autostash'

* rr/rebase-autostash:
  git-rebase: fix typo
parents 2ed8ecaf ac1998de
......@@ -159,7 +159,7 @@ finish_rebase () {
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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment