diff options
author | Jeff King <peff@peff.net> | 2019-01-24 07:35:40 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-24 12:18:53 -0800 |
commit | 04b19fcafd734245e61fd1c090cd7de8c2993eaa (patch) | |
tree | a854de97fc20da34375096928079dbe2d376f6dd /prompt.c | |
parent | combine-diff: treat --shortstat like --stat (diff) | |
download | tgif-04b19fcafd734245e61fd1c090cd7de8c2993eaa.tar.xz |
combine-diff: treat --summary like --stat
Currently "--cc --summary" on a merge shows nothing. Since we show "--cc
--stat" as a stat against the first parent, and because --summary is
typically used in combination with --stat, it makes sense to treat them
both the same way.
Note that we have to tweak t4013's setup a bit to test this case, as the
existing merges do not have any --summary results against their first
parent. But since the merge at the tip of 'master' does add and remove
files with respect to the second parent, we can just make a reversed
doppelganger merge where the parents are swapped.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'prompt.c')
0 files changed, 0 insertions, 0 deletions