diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-23 12:39:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-23 12:39:05 -0700 |
| commit | 1f643446598c3727b506a46d88f734b13e90dc77 (patch) | |
| tree | 7dcbb73fe11b182209a398e56cf02469f7af7db1 /t/t3031-merge-criscross.sh | |
| parent | d1ca788fcd34962a65924843ef1d0c773d565030 (diff) | |
| parent | a6754cda4362d129738d42d2683d07d433379e99 (diff) | |
| download | git-1f643446598c3727b506a46d88f734b13e90dc77.tar.gz | |
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
Diffstat (limited to 't/t3031-merge-criscross.sh')
0 files changed, 0 insertions, 0 deletions