diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-13 15:01:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 15:01:41 -0700 |
| commit | 5996b6708bc4458944b9a352131bf882bedd1535 (patch) | |
| tree | edd298d85f738b1ebc56585b3503bc72b4a4754e /git-pull.html | |
| parent | 84ea1e42221ac3bab88dda1a6ee25a11802cfef9 (diff) | |
| download | git-htmldocs-5996b6708bc4458944b9a352131bf882bedd1535.tar.gz | |
Autogenerated HTML docs for v2.8.1-185-gdc0db
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html index 65f175386..b6c4e3bc1 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1062,6 +1062,21 @@ 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 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">
@@ -1881,7 +1896,7 @@ version.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-01-26 16:20:09 PST
+Last updated 2016-04-13 15:01:05 PDT
</div>
</div>
</body>
|