diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-18 21:32:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-18 21:32:53 (GMT) |
| commit | 3f6dc9c36693c2ba6dd5fb61fbad6b72cc08e3d1 (patch) | |
| tree | 208b57eec6d5ac38c15da83ca6503910f5450e9d /Documentation/gitk.txt | |
| parent | a1f95951efc55c97477e32287b06e204553be5c2 (diff) | |
| parent | 3af31e87868d46363359148db5243f46d49029e8 (diff) | |
| download | git-3f6dc9c36693c2ba6dd5fb61fbad6b72cc08e3d1.zip git-3f6dc9c36693c2ba6dd5fb61fbad6b72cc08e3d1.tar.gz git-3f6dc9c36693c2ba6dd5fb61fbad6b72cc08e3d1.tar.bz2 | |
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/gitk.txt')
| -rw-r--r-- | Documentation/gitk.txt | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index c653ebb..d50e9ed 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -98,25 +98,7 @@ linkgit:git-rev-list[1] for a complete list. (See "History simplification" in linkgit:git-log[1] for a more detailed explanation.) --L<start>,<end>:<file>:: --L:<funcname>:<file>:: - - Trace the evolution of the line range given by "<start>,<end>" - (or the function name regex <funcname>) within the <file>. You may - not give any pathspec limiters. This is currently limited to - a walk starting from a single revision, i.e., you may only - give zero or one positive revision arguments, and - <start> and <end> (or <funcname>) must exist in the starting revision. - You can specify this option more than once. Implies `--patch`. - Patch output can be suppressed using `--no-patch`, but other diff formats - (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`, - `--name-only`, `--name-status`, `--check`) are not currently implemented. -+ -*Note:* gitk (unlike linkgit:git-log[1]) currently only understands -this option if you specify it "glued together" with its argument. Do -*not* put a space after `-L`. -+ -include::line-range-format.txt[] +include::line-range-options.txt[] <revision range>:: |