X-Git-Url: http://git.scripts.mit.edu/?a=blobdiff_plain;f=git-rebase.sh;h=8d7659a22c253b9f9535aee38e3bf0ce380cef75;hb=aa8bd519dbf044f4b54a365c9c80c6eb9a1ee2ea;hp=0039ecfb407960444c31d48767b65cf773a3243a;hpb=2bf3501150145d1f05678c20ab8e8d66f849851f;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index 0039ecfb40..8d7659a22c 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -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