Skip to content

Commit

Permalink
Merge branch 'rr/rebase-autostash'
Browse files Browse the repository at this point in the history
* rr/rebase-autostash:
  git-rebase: fix typo
  • Loading branch information
Junio C Hamano committed Jul 31, 2013
2 parents 2ed8eca + ac1998d commit c8686e5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c8686e5

Please sign in to comment.