doc/git-log: clarify handling of merge commit diffs
authorJeff King <redacted>
Wed, 29 Jul 2020 20:12:20 +0000 (16:12 -0400)
committerJunio C Hamano <redacted>
Wed, 29 Jul 2020 20:44:03 +0000 (13:44 -0700)
commit5fbb4bc1910f76b344fcb88df2544701b6030435
tree6c2aac115183f67883ff51d3c51cd2a930a59d2d
parent9a6d515fc38abc36a94228f2b96813e1b07c0059
doc/git-log: clarify handling of merge commit diffs

It can be surprising that git-log doesn't show any diff for merge
commits by default. Arguably "--cc" would be a reasonable default, but
it's very expensive (which is why we turn it on for "git show" but not
for "git log"). Let's at least document the current behavior, including
the recent "--first-parent implies -m" case

Signed-off-by: Jeff King <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-log.txt
git clone https://git.99rst.org/PROJECT