summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-09-18 11:50:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-09-18 11:50:09 -0700
commitde67293e74888be95fb499560c1b38fe05b13af7 (patch)
treea29d8386d75018730841fb9c4f15c3614aa58e9e /builtin/merge.c
parentMerge branch 'sg/complete-configuration-variables' (diff)
parentline-log: avoid unnecessary full tree diffs (diff)
downloadtgif-de67293e74888be95fb499560c1b38fe05b13af7.tar.xz
Merge branch 'sg/line-log-tree-diff-optim'
Optimize unnecessary full-tree diff away from "git log -L" machinery. * sg/line-log-tree-diff-optim: line-log: avoid unnecessary full tree diffs line-log: extract pathspec parsing from line ranges into a helper function
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions