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>
Miklos Vajna committed
Jun 7, 2008 at 18:20 UTC
88b1f0b8094638b1f9533393d1436d8c51fd07d5
1 file changed
+3
-3
git-rebase--interactive.sh
+3
-3
@@ -530,9 +530,9 @@ do
530
# Rebase $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO
531
#
532
# Commands:
533
-# pick = use commit
534
-# edit = use commit, but stop for amending
535
-# squash = use commit, but meld into previous commit
533
+# p, pick = use commit
534
+# e, edit = use commit, but stop for amending
535
+# s, squash = use commit, but meld into previous commit
536
#
537
# If you remove a line here THAT COMMIT WILL BE LOST.
538
# However, if you remove everything, the rebase will be aborted.