projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
git-rebase--interactive.sh patch | diff1 | diff2 | blob | history

diff --cc git-rebase--interactive.sh
Simple merge
Git—the stupid content tracker