From: Junio C Hamano Date: Wed, 2 May 2012 04:11:26 +0000 (-0700) Subject: Merge branch 'jk/rebase-i-submodule-conflict-only' into maint X-Git-Tag: v1.7.10.1~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a4da3388fd83e4b31273d71bebf8a92becd8f60c Merge branch 'jk/rebase-i-submodule-conflict-only' into maint 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 --- a4da3388fd83e4b31273d71bebf8a92becd8f60c