summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-06-07 18:20:19 +0200
committerJunio C Hamano <gitster@pobox.com>2008-06-08 13:46:37 -0700
commit88b1f0b8094638b1f9533393d1436d8c51fd07d5 (patch)
tree6564fdd6488d721e7b0fd8d5f6e307cc927a74e6 /git-rebase--interactive.sh
parent39468defd306b7fb8ca0d381a2d66216a8eb9095 (diff)
downloadgit-88b1f0b8094638b1f9533393d1436d8c51fd07d5.tar.gz
git-rebase -i: mention the short command aliases in the todo list
git rebase -i already supports 'p', 'e' and 's' as aliases for 'pick', 'edit' and 'squash', but one could know it only by reading the source code. If a user rebases a lot, it's quite handy, so mention these short forms as well. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 0ca986f721..a64d9d57ab 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -530,9 +530,9 @@ do
# Rebase $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO
#
# Commands:
-# pick = use commit
-# edit = use commit, but stop for amending
-# squash = use commit, but meld into previous commit
+# p, pick = use commit
+# e, edit = use commit, but stop for amending
+# s, squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.