summaryrefslogtreecommitdiff
path: root/builtin/index-pack.c
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2021-04-13 14:41:17 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-04-16 23:38:35 -0700
commit17c13e60fd799336b28d320dcba06fe1ef06e01d (patch)
tree06050127b529d7308656ae8a218c3e7c9db5d431 /builtin/index-pack.c
parentdiff-merges: adapt -m to enable default diff format (diff)
downloadtgif-17c13e60fd799336b28d320dcba06fe1ef06e01d.tar.xz
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>
Diffstat (limited to 'builtin/index-pack.c')
0 files changed, 0 insertions, 0 deletions