Junio C Hamano 94367a8fdf Merge branch 'jk/rebase-i-submodule-conflict-only' into next ...

Giving "--continue" to a conflicted "rebase -i" session skipped a commit
that only results in changes to submodules.

Will merge to 'next'.

By John Keeping
* jk/rebase-i-submodule-conflict-only:
  rebase -i continue: don't skip commits that only change submodules

2012-04-15 23:06:43 -07:00

22 KiB

Raw Blame History

View Raw