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

gitster · gitster · commit 0e9b0ac712d0 · 2012-04-16T12:39:41.000-07:00
* nl/rebase-i-cheat-sheet:
  rebase -i: remind that the lines are top-to-bottom
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
@@ -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.
 #

Original file line number	Diff line number	Diff line change
`@@ -846,6 +846,8 @@ cat >> "$todo" << EOF`
`846`	`846`	`# f, fixup = like "squash", but discard this commit's log message`
`847`	`847`	`# x, exec = run command (the rest of the line) using shell`
`848`	`848`	`#`
	`849`	`+# These lines can be re-ordered; they are executed from top to bottom.`
	`850`	`+#`
`849`	`851`	`# If you remove a line here THAT COMMIT WILL BE LOST.`
`850`	`852`	`# However, if you remove everything, the rebase will be aborted.`
`851`	`853`	`#`