Autogenerated HTML docs for v2.3.4-315-gbca18

1 files changed, 5 insertions, 2 deletions

diff --git a/git-log.html b/git-log.html
index 9ee3a0f32..210b4e75b 100644
--- a/git-log.html
+++ b/git-log.html
@@ -1142,7 +1142,8 @@ parents) and <code>--max-parents=-1</code> (negative numbers denote no upper lim
         because merges into a topic branch tend to be only about

         adjusting to updated upstream from time to time, and

         this option allows you to ignore the individual commits

-        brought in to your history by such a merge.

+        brought in to your history by such a merge. Cannot be

+        combined with --bisect.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1251,7 +1252,7 @@ explicitly.</p></div>
         Pretend as if the bad bisection ref <code>refs/bisect/bad</code>

         was listed and as if it was followed by <code>--not</code> and the good

         bisection refs <code>refs/bisect/good-*</code> on the command

-        line.

+        line. Cannot be combined with --first-parent.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1811,6 +1812,7 @@ together.</p></div>
         given on the command line. Otherwise (if <code>sorted</code> or no argument

         was given), the commits are shown in reverse chronological order

         by commit time.

+        Cannot be combined with <code>--graph</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -2052,6 +2054,7 @@ format, often found in email messages.</p></div>
         on the left hand side of the output.  This may cause extra lines

         to be printed in between commits, in order for the graph history

         to be drawn properly.

+        Cannot be combined with <code>--no-walk</code>.

 </p>

 <div class="paragraph"><p>This enables parent rewriting, see <em>History Simplification</em> below.</p></div>

 <div class="paragraph"><p>This implies the <code>--topo-order</code> option by default, but the