| commit | 17c13e60fd799336b28d320dcba06fe1ef06e01d | |
| author | Sergey Organov <sorganov@gmail.com> | |
| Tue, 13 Apr 2021 11:41:17 +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 | 06050127b529d7308656ae8a218c3e7c9db5d431 | treesnapshot (tar.gz zip) |
| parent | 38fc4dbbc2f110192752a3b2c99abb745f0494bf | commitdiff |
diff-merges: introduce log.diffMerges config variable
New log.diffMerges configuration variable sets the format that
--diff-merges=on will be using. The default is "separate".
t4013: add the following tests for log.diffMerges config:
* Test that wrong values are denied.
* Test that the value of log.diffMerges properly affects both
--diff-merges=on and -m.
t9902: fix completion tests for log.d* to match log.diffMerges.
Added documentation for log.diffMerges.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
New log.diffMerges configuration variable sets the format that
--diff-merges=on will be using. The default is "separate".
t4013: add the following tests for log.diffMerges config:
* Test that wrong values are denied.
* Test that the value of log.diffMerges properly affects both
--diff-merges=on and -m.
t9902: fix completion tests for log.d* to match log.diffMerges.
Added documentation for log.diffMerges.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>