blame: document multiple -L support

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 489032c7a3edbdf92d0dff05ab065868da62132f..0cebc4f6927211ffbc013de9368f03f480dba65d 100644 (file)
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -11,9 +11,11 @@
 
 -L <start>,<end>::
 -L :<regex>::
 
 -L <start>,<end>::
 -L :<regex>::

-       Annotate only the given line range.  <start> and <end> are optional.
-       ``-L <start>'' or ``-L <start>,'' spans from <start> to end of file.
-       ``-L ,<end>'' spans from start of file to <end>.
+       Annotate only the given line range. May be specified multiple times.
+       Overlapping ranges are allowed.
++
+<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from
+<start> to end of file. ``-L ,<end>'' spans from start of file to <end>.

 +
 include::line-range-format.txt[]
 
 +
 include::line-range-format.txt[]
 

diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 6cea7f1ce1ba3a917ddd0cc9a12195d6f768bf76..f2c85cc6334e50f716c23be6cac4e502fe4d228f 100644 (file)
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
 --------
 [verse]
 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]

-           [-L n,m | -L :fn] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
+           [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]

            [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>] [--] <file>
 
 DESCRIPTION
            [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>] [--] <file>
 
 DESCRIPTION


@@ -18,7 +18,8 @@ DESCRIPTION
 Annotates each line in the given file with information from the revision which
 last modified the line. Optionally, start annotating from the given revision.
 
 Annotates each line in the given file with information from the revision which
 last modified the line. Optionally, start annotating from the given revision.
 

-The command can also limit the range of lines annotated.
+When specified one or more times, `-L` restricts annotation to the requested
+lines.

 
 The origin of lines is automatically followed across whole-file
 renames (currently there is no option to turn the rename-following
 
 The origin of lines is automatically followed across whole-file
 renames (currently there is no option to turn the rename-following


@@ -130,7 +131,10 @@ SPECIFYING RANGES
 
 Unlike 'git blame' and 'git annotate' in older versions of git, the extent
 of the annotation can be limited to both line ranges and revision
 
 Unlike 'git blame' and 'git annotate' in older versions of git, the extent
 of the annotation can be limited to both line ranges and revision

-ranges.  When you are interested in finding the origin for
+ranges. The `-L` option, which limits annotation to a range of lines, may be
+specified multiple times.
+
+When you are interested in finding the origin for

 lines 40-60 for file `foo`, you can use the `-L` option like so
 (they mean the same thing -- both ask for 21 lines starting at
 line 40):
 lines 40-60 for file `foo`, you can use the `-L` option like so
 (they mean the same thing -- both ask for 21 lines starting at
 line 40):