Autogenerated HTML docs for v1.7.12.1-382-gb0576

1 files changed, 16 insertions, 5 deletions

diff --git a/git-log.html b/git-log.html
index 3ea1031c2..bd3001b95 100644
--- a/git-log.html
+++ b/git-log.html
@@ -686,8 +686,13 @@ be prefixed with "-- " to separate them from options or refnames.</p></div>
 <h3 id="_commit_limiting">Commit Limiting</h3><div style="clear:left"></div>

 <div class="paragraph"><p>Besides specifying a range of commits that should be listed using the

 special notations explained in the description, additional commit

-limiting may be applied. Note that they are applied before commit

-ordering and formatting options, such as <em>--reverse</em>.</p></div>

+limiting may be applied.</p></div>

+<div class="paragraph"><p>Using more options generally further limits the output (e.g.

+<tt>--since=&lt;date1&gt;</tt> limits to commits newer than <tt>&lt;date1&gt;</tt>, and using it

+with <tt>--grep=&lt;pattern&gt;</tt> further limits to commits whose log message

+has a line that matches <tt>&lt;pattern&gt;</tt>), unless otherwise noted.</p></div>

+<div class="paragraph"><p>Note that these are applied before commit

+ordering and formatting options, such as <tt>--reverse</tt>.</p></div>

 <div class="dlist"><dl>

 <dt class="hdlist1">

 -&lt;number&gt;

@@ -742,7 +747,10 @@ ordering and formatting options, such as <em>--reverse</em>.</p></div>
 <dd>

 <p>

         Limit the commits output to ones with author/committer

-        header lines that match the specified pattern (regular expression).

+        header lines that match the specified pattern (regular

+        expression).  With more than one <tt>--author=&lt;pattern&gt;</tt>,

+        commits whose author matches any of the given patterns are

+        chosen (similarly for multiple <tt>--committer=&lt;pattern&gt;</tt>).

 </p>

 </dd>

 <dt class="hdlist1">

@@ -751,7 +759,10 @@ ordering and formatting options, such as <em>--reverse</em>.</p></div>
 <dd>

 <p>

         Limit the commits output to ones with log message that

-        matches the specified pattern (regular expression).

+        matches the specified pattern (regular expression).  With

+        more than one <tt>--grep=&lt;pattern&gt;</tt>, commits whose message

+        matches any of the given patterns are chosen (but see

+        <tt>--all-match</tt>).

 </p>

 </dd>

 <dt class="hdlist1">

@@ -760,7 +771,7 @@ ordering and formatting options, such as <em>--reverse</em>.</p></div>
 <dd>

 <p>

         Limit the commits output to ones that match all given --grep,

-        --author and --committer instead of ones that match at least one.

+        instead of ones that match at least one.

 </p>

 </dd>

 <dt class="hdlist1">