Skip to content

Commit

Permalink
Documentation: change -L:<regex> to -L:<funcname>
Browse files Browse the repository at this point in the history
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 <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Matthieu Moy authored and Junio C Hamano committed Apr 20, 2015
1 parent 52735a6 commit d349e0e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Documentation/blame-options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Include additional statistics at the end of blame output.

-L <start>,<end>::
-L :<regex>::
-L :<funcname>::
Annotate only the given line range. May be specified multiple times.
Overlapping ranges are allowed.
+
Expand Down
4 changes: 2 additions & 2 deletions Documentation/git-log.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ produced by `--stat`, etc.
output by allowing them to allocate space in advance.

-L <start>,<end>:<file>::
-L :<regex>:<file>::
-L :<funcname>:<file>::
Trace the evolution of the line range given by "<start>,<end>"
(or the funcname regex <regex>) within the <file>. You may
(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.
Expand Down
4 changes: 2 additions & 2 deletions Documentation/gitk.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ linkgit:git-rev-list[1] for a complete list.
detailed explanation.)

-L<start>,<end>:<file>::
-L:<regex>:<file>::
-L:<funcname>:<file>::

Trace the evolution of the line range given by "<start>,<end>"
(or the funcname regex <regex>) within the <file>. You may
(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.
Expand Down
11 changes: 6 additions & 5 deletions Documentation/line-range-format.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ This is only valid for <end> and will specify a number
of lines before or after the line given by <start>.

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

0 comments on commit d349e0e

Please sign in to comment.