summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-31 12:38:29 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-31 12:38:29 -0700
commitc8686e510fa56d3e8349ec3ca83215a107d47d45 (patch)
tree42c459d70a585e13fadf88cbf84239f2d01cb219 /git-rebase.sh
parent2ed8ecaf57271e506cefffb5f777f50a6a91a4b4 (diff)
parentac1998deddbb5b59c80f2a3d902e18b31fe9cc50 (diff)
downloadgit-c8686e510fa56d3e8349ec3ca83215a107d47d45.tar.gz
Merge branch 'rr/rebase-autostash'
* rr/rebase-autostash: git-rebase: fix typo
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
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