| commit | dd65a9e5e3b6298e4fa52e21680008e7fd5556ea | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Feb 2016 22:16:03 +0000 (3 14:16 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Feb 2016 22:16:03 +0000 (3 14:16 -0800) | ||
| tree | ad06b92e0951d01a9bb5dc7085638d80420f29a0 | treesnapshot (tar.gz zip) |
| parent | cc329f65a34911999cfbb68bd83c6a54b93e461c | commitdiff |
| parent | 933cfeb90b5d03b4096db6d60494a6eedea25d03 | commitdiff |
Merge branch 'dw/subtree-split-do-not-drop-merge'
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
| contrib/subtree/git-subtree.sh | diff1 | diff2 | blobhistory |