Autogenerated HTML docs for v1.8.4-242-gbb80ee

1 files changed, 13 insertions, 12 deletions

diff --git a/git-annotate.html b/git-annotate.html
index ea212323c..363912d7b 100644
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -800,10 +800,11 @@ familiar command name for people coming from other SCM systems.</p></div>
 </dt>

 <dd>

 <p>

-        Annotate only the given line range.  &lt;start&gt; and &lt;end&gt; are optional.

-        &#8220;-L &lt;start&gt;&#8221; or &#8220;-L &lt;start&gt;,&#8221; spans from &lt;start&gt; to end of file.

-        &#8220;-L ,&lt;end&gt;&#8221; spans from start of file to &lt;end&gt;.

+        Annotate only the given line range. May be specified multiple times.

+        Overlapping ranges are allowed.

 </p>

+<div class="paragraph"><p>&lt;start&gt; and &lt;end&gt; are optional. &#8220;-L &lt;start&gt;&#8221; or &#8220;-L &lt;start&gt;,&#8221; spans from

+&lt;start&gt; to end of file. &#8220;-L ,&lt;end&gt;&#8221; spans from start of file to &lt;end&gt;.</p></div>

 <div class="paragraph"><p>&lt;start&gt; and &lt;end&gt; can take one of these forms:</p></div>

 <div class="ulist"><ul>

 <li>

@@ -818,7 +819,10 @@ absolute line number (lines count from 1).</p></div>
 /regex/

 </p>

 <div class="paragraph"><p>This form will use the first line matching the given

-POSIX regex.  If &lt;end&gt; is a regex, it will search

+POSIX regex. If &lt;start&gt; is a regex, it will search from the end of

+the previous <code>-L</code> range, if any, otherwise from the start of file.

+If &lt;start&gt; is &#8220;^/regex/&#8221;, it will search from the start of file.

+If &lt;end&gt; is a regex, it will search

 starting at the line given by &lt;start&gt;.</p></div>

 </li>

 <li>

@@ -828,15 +832,12 @@ starting at the line given by &lt;start&gt;.</p></div>
 <div class="paragraph"><p>This is only valid for &lt;end&gt; and will specify a number

 of lines before or after the line given by &lt;start&gt;.</p></div>

 </li>

-<li>

-<p>

-:regex

-</p>

-<div class="paragraph"><p>If the option&#8217;s argument is of the form :regex, it denotes the range

-from the first funcname line that matches &lt;regex&gt;, up to the next

-funcname line.</p></div>

-</li>

 </ul></div>

+<div class="paragraph"><p>If &#8220;:&lt;regex&gt;&#8221; is given in place of &lt;start&gt; and &lt;end&gt;, it denotes the range

+from the first funcname line that matches &lt;regex&gt;, up to the next

+funcname line. &#8220;:&lt;regex&gt;&#8221; searches from the end of the previous <code>-L</code> range,

+if any, otherwise from the start of file.

+&#8220;^:&lt;regex&gt;&#8221; searches from the start of file.</p></div>

 </dd>

 <dt class="hdlist1">

 -l