X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-rebase--interactive.sh;h=a64d9d57ab5943ac4e065866ce0ccd7de5364a9a;hb=7d3580d74c6d801419dd91416f9a81750b7d4e2c;hp=0ca986f7213280bef067f7a0ee53d1a154f1803d;hpb=60727b5800d7791e5b107620cb5b2d344cf97fe9;p=git.git 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.