Signed-off-by: Pierre Habouzit <madcoder@xxxxxxxxxx> --- git-rebase--interactive.sh | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index c1b4260..a3c5488 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -695,15 +695,16 @@ do # to a commit previously marked with the 'mark' insn. # # Commands: -# p, pick = use commit -# e, edit = use commit, but stop for amending -# c, comment = use commit, but stop for changing the commit message -# s, squash = use commit, but meld into previous commit -# mark :mark = mark the current HEAD for later reference -# reset commit = reset HEAD to the commit -# merge commit-M commit-P ... = redo merge commit-M with the -# current HEAD and the parents commit-P -# tag = reset tag to the current HEAD +# p, pick use commit +# e, edit use commit, but stop for amending +# c, comment use commit, but update the commit message on the way +# s, squash use commit, but meld into previous commit +# mark :mark mark the current HEAD for later reference +# reset commit reset HEAD to the commit +# merge commit-M commit-P +# redo merge commit-M with the current HEAD +# and the parents commit-P +# tag reset tag to the current HEAD # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. -- 1.5.6.rc2.128.g6656e -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
