diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-03 14:16:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-03 14:16:03 -0800 |
| commit | dd65a9e5e3b6298e4fa52e21680008e7fd5556ea (patch) | |
| tree | ad06b92e0951d01a9bb5dc7085638d80420f29a0 /diff-no-index.c | |
| parent | Merge branch 'tb/complete-word-diff-regex' (diff) | |
| parent | contrib/subtree: fix "subtree split" skipped-merge bug (diff) | |
| download | git-dd65a9e5e3b6298e4fa52e21680008e7fd5556ea.tar.gz git-dd65a9e5e3b6298e4fa52e21680008e7fd5556ea.zip | |
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
Diffstat (limited to 'diff-no-index.c')
0 files changed, 0 insertions, 0 deletions