diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-06 04:00:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-06 04:00:36 (GMT) |
| commit | 67498507699641549094f0cbf8800f88176b50c9 (patch) | |
| tree | 952672be724d1f36844131d1b73e2e148d6fd212 /Documentation/line-range-format.txt | |
| parent | 64c9e027658124a29aeae47e43fa08aaff760f43 (diff) | |
| parent | 0269f968b7effea8a4f61f1fb0ac7e9386a9d90c (diff) | |
| download | git-67498507699641549094f0cbf8800f88176b50c9.zip git-67498507699641549094f0cbf8800f88176b50c9.tar.gz git-67498507699641549094f0cbf8800f88176b50c9.tar.bz2 | |
Merge branch 'mm/usage-log-l-can-take-regex'
Documentation fix.
* mm/usage-log-l-can-take-regex:
log -L: improve error message on malformed argument
Documentation: change -L:<regex> to -L:<funcname>
Diffstat (limited to 'Documentation/line-range-format.txt')
| -rw-r--r-- | Documentation/line-range-format.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/line-range-format.txt b/Documentation/line-range-format.txt index d7f2603..829676f 100644 --- a/Documentation/line-range-format.txt +++ b/Documentation/line-range-format.txt @@ -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. |