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>
This commit is contained in:
Miklos Vajna 2008-06-07 18:20:19 +02:00 коммит произвёл Junio C Hamano
Родитель 39468defd3
Коммит 88b1f0b809
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -530,9 +530,9 @@ do
# Rebase $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO # Rebase $SHORTUPSTREAM..$SHORTHEAD onto $SHORTONTO
# #
# Commands: # Commands:
# pick = use commit # p, pick = use commit
# edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit # s, squash = use commit, but meld into previous commit
# #
# If you remove a line here THAT COMMIT WILL BE LOST. # If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted. # However, if you remove everything, the rebase will be aborted.