projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d1ca788 a6754cd)
Merge branch 'jk/rebase-i-submodule-conflict-only'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Apr 2012 19:39:04 +0000 (12:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Apr 2012 19:39:05 +0000 (12:39 -0700)
commit1f643446598c3727b506a46d88f734b13e90dc77
tree7dcbb73fe11b182209a398e56cf02469f7af7db1tree | snapshot
parentd1ca788fcd34962a65924843ef1d0c773d565030commit | diff
parenta6754cda4362d129738d42d2683d07d433379e99commit | diff
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
git-rebase--interactive.sh diff1 | diff2 | blob | history
Git—the stupid content tracker