tree 208b57eec6d5ac38c15da83ca6503910f5450e9d
parent a1f95951efc55c97477e32287b06e204553be5c2
parent 3af31e87868d46363359148db5243f46d49029e8
author Junio C Hamano <gitster@pobox.com> 1605735173 -0800
committer Junio C Hamano <gitster@pobox.com> 1605735173 -0800

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'