diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:34:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:34:01 -0700 |
| commit | 811ce1b47c5486fa3348617d062e2eb4593962a1 (patch) | |
| tree | 431dd9d5d47b7ef6b38df1cec32209324529d23a /Documentation/line-range-format.txt | |
| parent | Merge branch 'jc/diff-no-index-d-f' into maint-2.3 (diff) | |
| parent | log -L: improve error message on malformed argument (diff) | |
| download | tgif-811ce1b47c5486fa3348617d062e2eb4593962a1.tar.xz | |
Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3
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 d7f26039ca..829676ff98 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. |