From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 May 2012 17:29:14 +0000 (-0700)
Subject: Merge branch 'nl/rebase-i-cheat-sheet' into maint
X-Git-Tag: v1.7.10.2~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bb16e8f42276bfca8f8b33d9dbb40c5cba50b8de?ds=inline;hp=-c

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

* nl/rebase-i-cheat-sheet:
rebase -i: remind that the lines are top-to-bottom
---

bb16e8f42276bfca8f8b33d9dbb40c5cba50b8de
diff --combined git-rebase--interactive.sh
index 454674976e,2b7eb6dda4..2e1325824c
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -672,7 -672,7 +672,7 @@@ rearrange_squash () 
  case "$action" in
  continue)
  	# do we have anything to commit?
 -	if git diff-index --cached --quiet --ignore-submodules HEAD --
 +	if git diff-index --cached --quiet HEAD --
  	then
  		: Nothing to commit -- skip this
  	else
@@@ -846,6 -846,8 +846,8 @@@ cat >> "$todo" << EO
  #  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.
  #