diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:11:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:11:26 -0700 |
| commit | a4da3388fd83e4b31273d71bebf8a92becd8f60c (patch) | |
| tree | 1d86a52290e732be24076f875203f82941e1e500 /diff.c | |
| parent | 520d2ce71c5c48e75f1d8baac7cb6fe6f6e8b915 (diff) | |
| parent | a6754cda4362d129738d42d2683d07d433379e99 (diff) | |
| download | git-a4da3388fd83e4b31273d71bebf8a92becd8f60c.tar.gz git-a4da3388fd83e4b31273d71bebf8a92becd8f60c.tar.xz | |
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions