mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-30 23:06:09 +02:00
Code

Merge branch 'rr/rebase-autostash' 

* rr/rebase-autostash:
  git-rebase: fix typo
This commit is contained in:
Junio C Hamano 2013-07-31 12:38:29 -07:00
parent 2ed8ecaf57 ac1998dedd
commit c8686e510f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-rebase.sh
View File

@ -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