Files
git-upstream/git_upstream/resources/todo_epilogue_1_7_5.txt
Paul Bourke 00377869a9 Show rebase help during interactive import
This commit extends the todo epilogue to include the usage text that is
shown during a standard git rebase.

The specific content of this can vary between Git versions, though only
slightly. The main change I can see looking at
https://github.com/git/git/blame/master/git-rebase--interactive.sh is
that a "drop" command was added 2.6.0 onwards, so two epilogue files are
supplied to deal with this. Further ones could be added in the future.

Change-Id: I89a840c6a02960c9f0f0204d85a3dd162e0a759a
2016-05-26 16:37:11 +01:00

19 lines
608 B
Plaintext

# Rebase %(shortrevisions)s onto %(shortonto)s
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out