| commit | 38fc4dbbc2f110192752a3b2c99abb745f0494bf | |
| author | Sergey Organov <sorganov@gmail.com> | |
| Tue, 13 Apr 2021 11:41:16 +0000 (13 14:41 +0300) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 Apr 2021 06:38:35 +0000 (16 23:38 -0700) | ||
| tree | 69a0410fe1c476668a112e69b218c8af080569f7 | treesnapshot (tar.gz zip) |
| parent | 26a0f58da84a7da11f9175144c9a926e7b376349 | commitdiff |
diff-merges: adapt -m to enable default diff format
Let -m option (and --diff-merges=m) enable the default format instead
of "separate", to be able to tune it with log.diffMerges option.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Let -m option (and --diff-merges=m) enable the default format instead
of "separate", to be able to tune it with log.diffMerges option.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| diff-merges.c | diffblobblamehistory |