diff options
author | Jeff King <peff@peff.net> | 2019-01-24 12:35:40 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-24 20:18:53 (GMT) |
commit | 04b19fcafd734245e61fd1c090cd7de8c2993eaa (patch) | |
tree | a854de97fc20da34375096928079dbe2d376f6dd /rebase-interactive.h | |
parent | 8290faa077784a2518d0a77b448ca2987c3baf07 (diff) | |
download | git-04b19fcafd734245e61fd1c090cd7de8c2993eaa.zip git-04b19fcafd734245e61fd1c090cd7de8c2993eaa.tar.gz git-04b19fcafd734245e61fd1c090cd7de8c2993eaa.tar.bz2 |
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 'rebase-interactive.h')
0 files changed, 0 insertions, 0 deletions