From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Apr 2012 19:39:04 +0000 (-0700)
Subject: Merge branch 'jk/rebase-i-submodule-conflict-only'
X-Git-Tag: v1.7.11-rc0~132
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1f643446598c3727b506a46d88f734b13e90dc77?ds=inline;hp=-c

Merge branch 'jk/rebase-i-submodule-conflict-only'

Giving "--continue" to a conflicted "rebase -i" session skipped a commit
that only results in changes to submodules.

By John Keeping
* jk/rebase-i-submodule-conflict-only:
rebase -i continue: don't skip commits that only change submodules
---

1f643446598c3727b506a46d88f734b13e90dc77
diff --combined git-rebase--interactive.sh
index 2b7eb6dda4,454674976e..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,8 -846,6 +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.
  #