mirror of
https://github.com/git/git.git
synced 2024-10-28 21:07:52 +01:00
Merge branch 'rr/rebase-autostash'
* rr/rebase-autostash: git-rebase: fix typo
This commit is contained in:
commit
c8686e510f
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue