From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Nov 2020 21:32:53 +0000 (-0800)
Subject: Merge branch 'pb/blame-funcname-range-userdiff'
X-Git-Tag: v2.30.0-rc0~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f6dc9c36693c2ba6dd5fb61fbad6b72cc08e3d1;p=thirdparty%2Fgit.git

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'
---

3f6dc9c36693c2ba6dd5fb61fbad6b72cc08e3d1