diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2013-08-06 09:59:35 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-06 14:26:26 -0700 |
| commit | 0ddd47193c225a9f7a658682d4e859771b45ab84 (patch) | |
| tree | 4cfd67cda0508dd2464588e261c1ece62c4cf145 | |
| parent | 1e159833c732d332eefd75d92bee22cf029ca84f (diff) | |
| download | git-0ddd47193c225a9f7a658682d4e859771b45ab84.tar.gz | |
line-range-format.txt: clarify -L:regex usage form
blame/log documentation describes -L option as:
-L<start>,<end>
-L:<regex>
<start> and <end> can take one of these forms:
* number
* /regex/
* +offset or -offset
* :regex
which is incorrect and confusing since :regex is not one of the valid
forms of <start> or <end>; in fact, it must be -L's lone argument.
Clarify by discussing :<regex> at the same indentation level as "<start>
and <end>...":
-L<start>,<end>
-L:<regex>
<start> and <end> can take one of these forms:
* number
* /regex/
* +offset or -offset
If :<regex> is given in place of <start> and <end> ...
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/blame-options.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-log.txt | 2 | ||||
| -rw-r--r-- | Documentation/line-range-format.txt | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index 4e55b1564e..489032c7a3 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -15,8 +15,6 @@ ``-L <start>'' or ``-L <start>,'' spans from <start> to end of file. ``-L ,<end>'' spans from start of file to <end>. + -<start> and <end> can take one of these forms: - include::line-range-format.txt[] -l:: diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index fe04e06acb..34097efea7 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -72,8 +72,6 @@ produced by --stat etc. give zero or one positive revision arguments. You can specify this option more than once. + -<start> and <end> can take one of these forms: - include::line-range-format.txt[] <revision range>:: diff --git a/Documentation/line-range-format.txt b/Documentation/line-range-format.txt index 3e7ce72daa..a1b2f4e089 100644 --- a/Documentation/line-range-format.txt +++ b/Documentation/line-range-format.txt @@ -1,3 +1,5 @@ +<start> and <end> can take one of these forms: + - number + If <start> or <end> is a number, it specifies an @@ -15,11 +17,8 @@ starting at the line given by <start>. + This is only valid for <end> and will specify a number of lines before or after the line given by <start>. -+ -- :regex + -If the option's argument is of the form :regex, it denotes the range +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. -+ |