summaryrefslogtreecommitdiff
path: root/Documentation/config/pull.txt
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2021-04-13 14:41:18 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-04-16 23:38:35 -0700
commit364bc11fe5711fe7fbb98abf376168a207e7a448 (patch)
tree455506e8726f4d2166ccddab656d78781ff59cf3 /Documentation/config/pull.txt
parentdiff-merges: introduce log.diffMerges config variable (diff)
downloadtgif-364bc11fe5711fe7fbb98abf376168a207e7a448.tar.xz
doc/diff-options: document new --diff-merges features
Document changes in -m and --diff-merges=m semantics, as well as new --diff-merges=on option. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/pull.txt')
0 files changed, 0 insertions, 0 deletions