summaryrefslogtreecommitdiff
path: root/git.rc
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2019-01-24 07:36:47 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-24 12:18:53 -0800
commitdac03b5518a053e52ed7ee20925970728d3ae4c3 (patch)
treefdafb212f5589a240346ce29fa29a1b2383e9726 /git.rc
parentcombine-diff: treat --summary like --stat (diff)
downloadtgif-dac03b5518a053e52ed7ee20925970728d3ae4c3.tar.xz
combine-diff: treat --dirstat like --stat
Currently "--cc --dirstat" will show nothing for a merge. Like --shortstat and --summary in the previous two patches, it probably makes sense to treat it like we do --stat, and show a stat against the first-parent. This case is less obviously correct than for --shortstat and --summary, as those are basically variants of --stat themselves. It's possible we could develop a multi-parent combined dirstat format, in which case we might regret defining this first-parent behavior. But the same could be said for --stat, and in the 12+ years of it showing first-parent stats, nobody has complained. So showing the first-parent dirstat is at least _useful_, and if we later develop a clever multi-parent stat format, we'd probably have to deal with --stat anyway. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git.rc')
0 files changed, 0 insertions, 0 deletions