mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
04b19fcafd
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>
7 lines
160 B
Plaintext
7 lines
160 B
Plaintext
$ git diff-tree --cc --summary REVERSE
|
|
2562325a7ee916efb2481da93073b82cec801cbc
|
|
create mode 100644 file1
|
|
delete mode 100644 file2
|
|
delete mode 100644 file3
|
|
$
|