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: http://git.tremily.us/?a=commitdiff_plain;h=1f643446598c3727b506a46d88f734b13e90dc77;p=git.git

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