summaryrefslogtreecommitdiff
path: root/diff-delta.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-18 13:32:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-18 13:32:53 -0800
commit3f6dc9c36693c2ba6dd5fb61fbad6b72cc08e3d1 (patch)
tree208b57eec6d5ac38c15da83ca6503910f5450e9d /diff-delta.c
parentMerge branch 'en/merge-ort-api-null-impl' (diff)
parentblame: simplify 'setup_blame_bloom_data' interface (diff)
downloadtgif-3f6dc9c36693c2ba6dd5fb61fbad6b72cc08e3d1.tar.xz
Merge branch 'pb/blame-funcname-range-userdiff'
"git blame -L :funcname -- path" did not work well for a path for which a userdiff driver is defined. * pb/blame-funcname-range-userdiff: blame: simplify 'setup_blame_bloom_data' interface blame: simplify 'setup_scoreboard' interface blame: enable funcname blaming with userdiff driver line-log: mention both modes in 'blame' and 'log' short help doc: add more pointers to gitattributes(5) for userdiff blame-options.txt: also mention 'funcname' in '-L' description doc: line-range: improve formatting doc: log, gitk: move '-L' description to 'line-range-options.txt'
Diffstat (limited to 'diff-delta.c')
0 files changed, 0 insertions, 0 deletions