summaryrefslogtreecommitdiff
path: root/contrib/README
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-03 14:16:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-03 14:16:03 -0800
commitdd65a9e5e3b6298e4fa52e21680008e7fd5556ea (patch)
treead06b92e0951d01a9bb5dc7085638d80420f29a0 /contrib/README
parentMerge branch 'tb/complete-word-diff-regex' (diff)
parentcontrib/subtree: fix "subtree split" skipped-merge bug (diff)
downloadtgif-dd65a9e5e3b6298e4fa52e21680008e7fd5556ea.tar.xz
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 'contrib/README')
0 files changed, 0 insertions, 0 deletions