diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-18 13:32:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-18 13:32:53 -0800 |
| commit | 3f6dc9c36693c2ba6dd5fb61fbad6b72cc08e3d1 (patch) | |
| tree | 208b57eec6d5ac38c15da83ca6503910f5450e9d /Documentation/diff-options.txt | |
| parent | a1f95951efc55c97477e32287b06e204553be5c2 (diff) | |
| parent | 3af31e87868d46363359148db5243f46d49029e8 (diff) | |
| download | git-3f6dc9c36693c2ba6dd5fb61fbad6b72cc08e3d1.tar.gz | |
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 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 2e7a93894c..746b144c76 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -704,7 +704,10 @@ endif::git-format-patch[] -W:: --function-context:: - Show whole surrounding functions of changes. + Show whole function as context lines for each change. + The function names are determined in the same way as + `git diff` works out patch hunk headers (see 'Defining a + custom hunk-header' in linkgit:gitattributes[5]). ifndef::git-format-patch[] ifndef::git-log[] |