Merge branch 'tb/ci-run-cocci-with-18.04' into maint

[thirdparty/git.git] / Documentation / gitk.txt

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index c653ebb6a80c03bab1e593f13b488d742ff5cbce..d50e9ed10e04c688b6ee898b20e24a1cd796cc78 100644 (file)
--- 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>::