diff options
| author | Jeff King <peff@peff.net> | 2020-07-29 22:12:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-29 22:44:03 +0200 |
| commit | 5fbb4bc1910f76b344fcb88df2544701b6030435 (patch) | |
| tree | 6c2aac115183f67883ff51d3c51cd2a930a59d2d /t/t4013-diff-various.sh | |
| parent | doc/git-log: move "-t" into diff-options list (diff) | |
| download | git-5fbb4bc1910f76b344fcb88df2544701b6030435.tar.xz git-5fbb4bc1910f76b344fcb88df2544701b6030435.zip | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013-diff-various.sh')
0 files changed, 0 insertions, 0 deletions