summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-03 22:16:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-03 22:16:03 (GMT)
commitdd65a9e5e3b6298e4fa52e21680008e7fd5556ea (patch)
treead06b92e0951d01a9bb5dc7085638d80420f29a0 /builtin/diff.c
parentcc329f65a34911999cfbb68bd83c6a54b93e461c (diff)
parent933cfeb90b5d03b4096db6d60494a6eedea25d03 (diff)
downloadgit-dd65a9e5e3b6298e4fa52e21680008e7fd5556ea.zip
git-dd65a9e5e3b6298e4fa52e21680008e7fd5556ea.tar.gz
git-dd65a9e5e3b6298e4fa52e21680008e7fd5556ea.tar.bz2
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 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions