From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Apr 2012 19:39:41 +0000 (-0700)
Subject: Merge branch 'nl/rebase-i-cheat-sheet'
X-Git-Tag: v1.7.11-rc0~154
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0e9b0ac712d09d77a10586f5ff669bf6af3dd538?hp=146fe8ce2488fea8a8e35285d825bfbbe07b806d

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

* 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
index 5812222eb9..2b7eb6dda4 100644
--- 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.
 #