Skip to content

Commit d349e0e

Browse files
moygitster
authored andcommitted
Documentation: change -L:<regex> to -L:<funcname>
The old wording was somehow implying that <start> and <end> were not regular expressions. Also, the common case is to use a plain function name here so <funcname> makes sense (the fact that it is a regular expression is documented in line-range-format.txt). Signed-off-by: Matthieu Moy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 52735a6 commit d349e0e

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

Documentation/blame-options.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Include additional statistics at the end of blame output.
1111

1212
-L <start>,<end>::
13-
-L :<regex>::
13+
-L :<funcname>::
1414
Annotate only the given line range. May be specified multiple times.
1515
Overlapping ranges are allowed.
1616
+

Documentation/git-log.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ produced by `--stat`, etc.
6262
output by allowing them to allocate space in advance.
6363

6464
-L <start>,<end>:<file>::
65-
-L :<regex>:<file>::
65+
-L :<funcname>:<file>::
6666
Trace the evolution of the line range given by "<start>,<end>"
67-
(or the funcname regex <regex>) within the <file>. You may
67+
(or the function name regex <funcname>) within the <file>. You may
6868
not give any pathspec limiters. This is currently limited to
6969
a walk starting from a single revision, i.e., you may only
7070
give zero or one positive revision arguments.

Documentation/gitk.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ linkgit:git-rev-list[1] for a complete list.
9999
detailed explanation.)
100100

101101
-L<start>,<end>:<file>::
102-
-L:<regex>:<file>::
102+
-L:<funcname>:<file>::
103103

104104
Trace the evolution of the line range given by "<start>,<end>"
105-
(or the funcname regex <regex>) within the <file>. You may
105+
(or the function name regex <funcname>) within the <file>. You may
106106
not give any pathspec limiters. This is currently limited to
107107
a walk starting from a single revision, i.e., you may only
108108
give zero or one positive revision arguments.

Documentation/line-range-format.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ This is only valid for <end> and will specify a number
2222
of lines before or after the line given by <start>.
2323

2424
+
25-
If ``:<regex>'' is given in place of <start> and <end>, it denotes the range
26-
from the first funcname line that matches <regex>, up to the next
27-
funcname line. ``:<regex>'' searches from the end of the previous `-L` range,
28-
if any, otherwise from the start of file.
29-
``^:<regex>'' searches from the start of file.
25+
If ``:<funcname>'' is given in place of <start> and <end>, it is a
26+
regular expression that denotes the range from the first funcname line
27+
that matches <funcname>, up to the next funcname line. ``:<funcname>''
28+
searches from the end of the previous `-L` range, if any, otherwise
29+
from the start of file. ``^:<funcname>'' searches from the start of
30+
file.

0 commit comments

Comments
 (0)