Autogenerated HTML docs for v2.26.2-447-gd61d2

1 files changed, 16 insertions, 16 deletions

diff --git a/git-pull.html b/git-pull.html
index 76a902f75..46fd3ecd0 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1082,6 +1082,21 @@ option can be used to override --squash.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--autostash

+</dt>

+<dt class="hdlist1">

+--no-autostash

+</dt>

+<dd>

+<p>

+        Automatically create a temporary stash entry before the operation

+        begins, and apply it after the operation ends.  This means

+        that you can run the operation on a dirty worktree.  However, use

+        with care: the final stash application after a successful

+        merge might result in non-trivial conflicts.

+</p>

+</dd>

+<dt class="hdlist1">

 --allow-unrelated-histories

 </dt>

 <dd>

@@ -1139,21 +1154,6 @@ unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.</td>
         Override earlier --rebase.

 </p>

 </dd>

-<dt class="hdlist1">

---autostash

-</dt>

-<dt class="hdlist1">

---no-autostash

-</dt>

-<dd>

-<p>

-        Before starting rebase, stash local modifications away (see

-        <a href="git-stash.html">git-stash(1)</a>) if needed, and apply the stash entry when

-        done. <code>--no-autostash</code> is useful to override the <code>rebase.autoStash</code>

-        configuration variable (see <a href="git-config.html">git-config(1)</a>).

-</p>

-<div class="paragraph"><p>This option is only valid when "--rebase" is used.</p></div>

-</dd>

 </dl></div>

 </div>

 <div class="sect2">

@@ -2212,7 +2212,7 @@ version.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-04-29 14:18:27 PDT

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

 </div>

 </div>

 </body>