diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-31 21:38:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-31 21:38:29 +0200 |
| commit | c8686e510fa56d3e8349ec3ca83215a107d47d45 (patch) | |
| tree | 42c459d70a585e13fadf88cbf84239f2d01cb219 | |
| parent | Merge branch 'rj/commit-slab-fix' (diff) | |
| parent | git-rebase: fix typo (diff) | |
| download | git-c8686e510fa56d3e8349ec3ca83215a107d47d45.tar.xz git-c8686e510fa56d3e8349ec3ca83215a107d47d45.zip | |
Merge branch 'rr/rebase-autostash'
* rr/rebase-autostash:
git-rebase: fix typo
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |