| commit | 4320815eb9a002b4ee64f70dda9b1c1e019f4894 | |
| author | Sergey Organov <sorganov@gmail.com> | |
| Tue, 13 Apr 2021 11:41:14 +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 | 7ab4f888b1111caf6d8889766351e80e58b9fc24 | treesnapshot (tar.gz zip) |
| parent | 56550ea718091e5868fdb241b5dfa882923db70c | commitdiff |
diff-merges: introduce --diff-merges=on
Introduce the notion of default diff format for merges, and the option
"on" to select it. The default format is "separate" and can't yet
be changed, so effectively "on" is just a synonym for "separate"
for now. Add corresponding test to t4013.
This is in preparation for introducing log.diffMerges configuration
option that will let --diff-merges=on to be configured to any
supported format.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Introduce the notion of default diff format for merges, and the option
"on" to select it. The default format is "separate" and can't yet
be changed, so effectively "on" is just a synonym for "separate"
for now. Add corresponding test to t4013.
This is in preparation for introducing log.diffMerges configuration
option that will let --diff-merges=on to be configured to any
supported format.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| diff-merges.c | diffblobblamehistory | |
| t/t4013-diff-various.sh | diffblobblamehistory |