From 0ddd47193c225a9f7a658682d4e859771b45ab84 Mon Sep 17 00:00:00 2001 From: Eric Sunshine Date: Tue, 6 Aug 2013 09:59:35 -0400 Subject: line-range-format.txt: clarify -L:regex usage form blame/log documentation describes -L option as: -L, -L: and 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 or ; in fact, it must be -L's lone argument. Clarify by discussing : at the same indentation level as " and ...": -L, -L: and can take one of these forms: * number * /regex/ * +offset or -offset If : is given in place of and ... Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- Documentation/blame-options.txt | 2 -- Documentation/git-log.txt | 2 -- 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 '' or ``-L ,'' spans from to end of file. ``-L ,'' spans from start of file to . + - and 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. + - and can take one of these forms: - include::line-range-format.txt[] :: 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 @@ + and can take one of these forms: + - number + If or is a number, it specifies an @@ -15,11 +17,8 @@ starting at the line given by . + This is only valid for and will specify a number of lines before or after the line given by . -+ -- :regex + -If the option's argument is of the form :regex, it denotes the range +If ``:'' is given in place of and , it denotes the range from the first funcname line that matches , up to the next funcname line. -+ -- cgit v1.2.3