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

diff --combined git-rebase--interactive.sh
index 2b7eb6dda4811baed98411f9191ac164a3c660d5,454674976ea7661b90d46ae5b5698be37b391166..2e1325824c5d1457a3a29fbf2b80661c05f035e6
--- 1/git-rebase--interactive.sh
--- 2/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.
  #