git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 520d2ce a6754cd)
Merge branch 'jk/rebase-i-submodule-conflict-only' into maint
authorJunio C Hamano <redacted>
Wed, 2 May 2012 04:11:26 +0000 (21:11 -0700)
committerJunio C Hamano <redacted>
Wed, 2 May 2012 04:11:26 +0000 (21:11 -0700)
commita4da3388fd83e4b31273d71bebf8a92becd8f60c
tree1d86a52290e732be24076f875203f82941e1e500tree | snapshot
parent520d2ce71c5c48e75f1d8baac7cb6fe6f6e8b915commit | diff
parenta6754cda4362d129738d42d2683d07d433379e99commit | diff
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
git clone https://git.99rst.org/PROJECT