Merge branch 'nl/rebase-i-cheat-sheet' into maint

* nl/rebase-i-cheat-sheet: rebase -i: remind that the lines are top-to-bottom
13 years ago · bb16e8f422
1 changed files with 2 additions and 0 deletions
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@ -846,6 +846,8 @@ cat >> "$todo" << EOF
				@@ -846,6 +846,8 @@ cat >> "$todo" << EOF
 #  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.
 #