summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-config-explicit-merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-06-14 13:33:27 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-06-14 13:33:27 +0900
commit8e444e66df45ee5bbe84af0d884c6625627219f3 (patch)
tree49dfc39c29fa972df26bfe933d934fd8633038c7 /t/t5515/fetch.br-config-explicit-merge
parentMerge branch 'en/ort-perf-batch-11' (diff)
parentdiff-merges: let "-m" imply "-p" (diff)
downloadtgif-8e444e66df45ee5bbe84af0d884c6625627219f3.tar.xz
Merge branch 'so/log-m-implies-p'
The "-m" option in "git log -m" that does not specify which format, if any, of diff is desired did not have any visible effect; it now implies some form of diff (by default "--patch") is produced. * so/log-m-implies-p: diff-merges: let "-m" imply "-p" diff-merges: rename "combined_imply_patch" to "merges_imply_patch" stash list: stop passing "-m" to "git log" git-svn: stop passing "-m" to "git rev-list" diff-merges: move specific diff-index "-m" handling to diff-index t4013: test "git diff-index -m" t4013: test "git diff-tree -m" t4013: test "git log -m --stat" t4013: test "git log -m --raw" t4013: test that "-m" alone has no effect in "git log"
Diffstat (limited to 't/t5515/fetch.br-config-explicit-merge')
0 files changed, 0 insertions, 0 deletions