| commit | eed5332a13ef15391039e5e953462201978058ec | |
| author | Jeff King <peff@peff.net> | |
| Wed, 29 Jul 2020 20:10:17 +0000 (29 16:10 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Jul 2020 20:43:57 +0000 (29 13:43 -0700) | ||
| tree | 045c59c14262fdd0be0c038cc2efcd05e9f42b40 | treesnapshot (tar.gz zip) |
| parent | 47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc | commitdiff |
log: drop "--cc implies -m" logic
This was added by 82dee4160c (log: show merge commit when --cc is given,
2015-08-20), which explains why we need it. But that commit failed to
notice that setup_revisions() already does the same thing, since
cd2bdc5309 (Common option parsing for "git log --diff" and friends,
2006-04-14).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This was added by 82dee4160c (log: show merge commit when --cc is given,
2015-08-20), which explains why we need it. But that commit failed to
notice that setup_revisions() already does the same thing, since
cd2bdc5309 (Common option parsing for "git log --diff" and friends,
2006-04-14).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/log.c | diffblobblamehistory |