From 88b1f0b8094638b1f9533393d1436d8c51fd07d5 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Sat, 7 Jun 2008 18:20:19 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 0ca986f72..a64d9d57a 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. -- 2.30.2