Autogenerated HTML docs for v2.26.2-533-gb34789

1 files changed, 9 insertions, 3 deletions

diff --git a/git-rebase.html b/git-rebase.html
index 891e751e5..48ad541b7 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1441,11 +1441,12 @@ details).</p></div>
 <em>fork_point</em> is the result of <code>git merge-base --fork-point &lt;upstream&gt;

 &lt;branch&gt;</code> command (see <a href="git-merge-base.html">git-merge-base(1)</a>).  If <em>fork_point</em>

 ends up being empty, the &lt;upstream&gt; will be used as a fallback.</p></div>

-<div class="paragraph"><p>If either &lt;upstream&gt; or --root is given on the command line, then the

-default is <code>--no-fork-point</code>, otherwise the default is <code>--fork-point</code>.</p></div>

+<div class="paragraph"><p>If &lt;upstream&gt; is given on the command line, then the default is

+<code>--no-fork-point</code>, otherwise the default is <code>--fork-point</code>.</p></div>

 <div class="paragraph"><p>If your branch was based on &lt;upstream&gt; but &lt;upstream&gt; was rewound and

 your branch contains commits which were dropped, this option can be used

 with <code>--keep-base</code> in order to drop those commits from your branch.</p></div>

+<div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>

 </dd>

 <dt class="hdlist1">

 --ignore-whitespace

@@ -1792,6 +1793,11 @@ used to override and disable this setting.</p></div>
 --keep-base and --root

 </p>

 </li>

+<li>

+<p>

+--fork-point and --root

+</p>

+</li>

 </ul></div>

 </div>

 </div>

@@ -2707,7 +2713,7 @@ Use <code>--rebase-merges</code> in such scenarios instead.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-04-29 16:59:10 PDT

+ 2020-05-01 14:51:11 PDT

 </div>

 </div>

 </body>