summaryrefslogtreecommitdiff
path: root/sha1dc
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-08-11 12:36:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-08-11 12:36:18 -0700
commit4c90d8908ac0c7ec9cd8d2caee7a1a0394636612 (patch)
treef2e35ad1607e81d578c6ffe9798b7129c1579f05 /sha1dc
parentMerge branch 'cb/many-alternate-optim-fixup' (diff)
parentRevert 'diff-merges: let "-m" imply "-p"' (diff)
downloadtgif-4c90d8908ac0c7ec9cd8d2caee7a1a0394636612.tar.xz
Merge branch 'jn/log-m-does-not-imply-p'
Earlier "git log -m" was changed to always produce patch output, which would break existing scripts, which has been reverted. * jn/log-m-does-not-imply-p: Revert 'diff-merges: let "-m" imply "-p"'
Diffstat (limited to 'sha1dc')
0 files changed, 0 insertions, 0 deletions