| commit | 6a65bdcc8c610b31fff6a171e6f49045c3980027 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Feb 2016 22:54:15 +0000 (5 14:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Feb 2016 22:54:15 +0000 (5 14:54 -0800) | ||
| tree | 32a80856e49b46fdca34f0d904a2b33f5183bb8c | treesnapshot (tar.gz zip) |
| parent | 0244713db17523700e97dd3573c819b51cccbcda | commitdiff |
| parent | 933cfeb90b5d03b4096db6d60494a6eedea25d03 | commitdiff |
Merge branch 'dw/subtree-split-do-not-drop-merge' into maint
The "split" subcommand of "git subtree" (in contrib/) incorrectly
skipped merges when it shouldn't, which was corrected.
* dw/subtree-split-do-not-drop-merge:
contrib/subtree: fix "subtree split" skipped-merge bug
The "split" subcommand of "git subtree" (in contrib/) incorrectly
skipped merges when it shouldn't, which was corrected.
* dw/subtree-split-do-not-drop-merge:
contrib/subtree: fix "subtree split" skipped-merge bug