summaryrefslogtreecommitdiff
path: root/t/t9119-git-svn-info.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-08-17 17:02:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-17 17:02:50 -0700
commita555b514cd47f59b43f571eaff6b8cd7c01f0d11 (patch)
tree1e73f9b75a386aed0efaf103786e2d1d639d0284 /t/t9119-git-svn-info.sh
parentMerge branch 'jk/log-fp-implies-m' (diff)
parentt/t4013: add test for --diff-merges=off (diff)
downloadtgif-a555b514cd47f59b43f571eaff6b8cd7c01f0d11.tar.xz
Merge branch 'so/log-diff-merges-opt'
Earlier, to countermand the implicit "-m" option when the "--first-parent" option is used with "git log", we added the "--[no-]diff-merges" option in the jk/log-fp-implies-m topic. To leave the door open to allow the "--diff-merges" option to take values that instructs how patches for merge commits should be computed (e.g. "cc"? "-p against first parent?"), redefine "--diff-merges" to take non-optional value, and implement "off" that means the same thing as "--no-diff-merges". * so/log-diff-merges-opt: t/t4013: add test for --diff-merges=off doc/git-log: describe --diff-merges=off revision: change "--diff-merges" option to require parameter
Diffstat (limited to 't/t9119-git-svn-info.sh')
0 files changed, 0 insertions, 0 deletions