Autogenerated HTML docs for v2.25.0-rc2-24-gb4615

1 files changed, 19 insertions, 40 deletions

diff --git a/git-rebase.html b/git-rebase.html
index a188819f2..a477f9e12 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1365,21 +1365,12 @@ with <code>--keep-base</code> in order to drop those commits from your branch.</
 <dt class="hdlist1">

 --ignore-whitespace

 </dt>

-<dd>

-<p>

-        Behaves differently depending on which backend is selected.

-</p>

-<div class="paragraph"><p><em>am</em> backend: When applying a patch, ignore changes in whitespace in

-context lines if necessary.</p></div>

-<div class="paragraph"><p><em>interactive</em> backend: Treat lines with only whitespace changes as

-unchanged for the sake of a three-way merge.</p></div>

-</dd>

 <dt class="hdlist1">

 --whitespace=&lt;option&gt;

 </dt>

 <dd>

 <p>

-        This flag is passed to the <em>git apply</em> program

+        These flag are passed to the <em>git apply</em> program

         (see <a href="git-apply.html">git-apply(1)</a>) that applies the patch.

 </p>

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

@@ -1387,25 +1378,13 @@ unchanged for the sake of a three-way merge.</p></div>
 <dt class="hdlist1">

 --committer-date-is-author-date

 </dt>

-<dd>

-<p>

-        Instead of recording the time the rebased commits are

-        created as the committer date, reuse the author date

-        as the committer date. This implies --force-rebase.

-</p>

-</dd>

 <dt class="hdlist1">

 --ignore-date

 </dt>

-<dt class="hdlist1">

---reset-author-date

-</dt>

 <dd>

 <p>

-        By default, the author date of the original commit is used

-        as the author date for the resulting commit.  This option

-        tells Git to use the current timestamp instead and implies

-        <code>--force-rebase</code>.

+        These flags are passed to <em>git am</em> to easily change the dates

+        of the rebased commits (see <a href="git-am.html">git-am(1)</a>).

 </p>

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

 </dd>

@@ -1593,11 +1572,26 @@ used to override and disable this setting.</p></div>
 <div class="ulist"><ul>

 <li>

 <p>

+--committer-date-is-author-date

+</p>

+</li>

+<li>

+<p>

+--ignore-date

+</p>

+</li>

+<li>

+<p>

 --whitespace

 </p>

 </li>

 <li>

 <p>

+--ignore-whitespace

+</p>

+</li>

+<li>

+<p>

 -C

 </p>

 </li>

@@ -1684,21 +1678,6 @@ used to override and disable this setting.</p></div>
 </li>

 <li>

 <p>

---preserve-merges and --ignore-whitespace

-</p>

-</li>

-<li>

-<p>

---preserve-merges and --committer-date-is-author-date

-</p>

-</li>

-<li>

-<p>

---preserve-merges and --ignore-date

-</p>

-</li>

-<li>

-<p>

 --keep-base and --onto

 </p>

 </li>

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

 <div id="footer-text">

 Last updated

- 2019-12-10 15:12:20 PST

+ 2020-01-12 16:37:43 PST

 </div>

 </div>

 </body>