diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 15:23:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 15:23:52 -0700 |
| commit | f1f5a7b64053a592c7655df84079443328582b68 (patch) | |
| tree | 9f7d07ba52ea6281993ea65e4805aeb31d2f080b /git-rebase.html | |
| parent | 8d74cd3acd56a5e53475ddc934fdf2e135a634e8 (diff) | |
| download | git-htmldocs-f1f5a7b64053a592c7655df84079443328582b68.tar.gz | |
Autogenerated HTML docs for v1.8.3.1-377-g4d1c5
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/git-rebase.html b/git-rebase.html index 977f76c75..e78863271 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -943,6 +943,14 @@ rebase.autosquash If set to true enable <em>--autosquash</em> option by default.
</p>
</dd>
+<dt class="hdlist1">
+rebase.autostash
+</dt>
+<dd>
+<p>
+ If set to true enable <em>--autostash</em> option by default.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -1284,6 +1292,18 @@ configuration variable <code>rebase.autosquash</code>, this option can be used to override and disable this setting.</p></div>
</dd>
<dt class="hdlist1">
+--[no-]autostash
+</dt>
+<dd>
+<p>
+ Automatically create a temporary stash before the operation
+ begins, and apply it after the operation ends. This means
+ that you can run rebase on a dirty worktree. However, use
+ with care: the final stash application after a successful
+ rebase might result in non-trivial conflicts.
+</p>
+</dd>
+<dt class="hdlist1">
--no-ff
</dt>
<dd>
@@ -1912,7 +1932,7 @@ reorder commits tend to produce counterintuitive results.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-06-11 15:22:06 PDT
</div>
</div>
</body>
|