diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
| commit | 6b7d215a58fcad73e1d989b5767c9d3b2ba6608b (patch) | |
| tree | 78de8e7c65f35106dfde60f0e6b4284f09e7f43f /git-rebase.html | |
| parent | e0f71462e15863fa4b188b26e30db0155d52a946 (diff) | |
| download | git-htmldocs-6b7d215a58fcad73e1d989b5767c9d3b2ba6608b.tar.gz | |
Autogenerated HTML docs for v2.21.0-419-gffac5
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/git-rebase.html b/git-rebase.html index 124f9d1e3..ebbe9ebc7 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -936,17 +936,12 @@ rebase.useBuiltin </dt>
<dd>
<p>
- Set to <code>false</code> to use the legacy shellscript implementation of
- <a href="git-rebase.html">git-rebase(1)</a>. Is <code>true</code> by default, which means use
- the built-in rewrite of it in C.
-</p>
-<div class="paragraph"><p>The C rewrite is first included with Git version 2.20. This option
-serves an an escape hatch to re-enable the legacy version in case any
-bugs are found in the rewrite. This option and the shellscript version
-of <a href="git-rebase.html">git-rebase(1)</a> will be removed in some future release.</p></div>
-<div class="paragraph"><p>If you find some reason to set this option to <code>false</code> other than
-one-off testing you should report the behavior difference as a bug in
-git.</p></div>
+ Unused configuration variable. Used in Git versions 2.20 and
+ 2.21 as an escape hatch to enable the legacy shellscript
+ implementation of rebase. Now the built-in rewrite of it in C
+ is always used. Setting this will emit a warning, to alert any
+ remaining users that setting this now does nothing.
+</p>
</dd>
<dt class="hdlist1">
rebase.stat
@@ -1208,6 +1203,18 @@ which makes little sense.</p></div> <div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>
</dd>
<dt class="hdlist1">
+--rerere-autoupdate
+</dt>
+<dt class="hdlist1">
+--no-rerere-autoupdate
+</dt>
+<dd>
+<p>
+ Allow the rerere mechanism to update the index with the
+ result of auto-conflict resolution if possible.
+</p>
+</dd>
+<dt class="hdlist1">
-S[<keyid>]
</dt>
<dt class="hdlist1">
@@ -2453,7 +2460,7 @@ Use <code>--rebase-merges</code> in such scenarios instead.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2019-04-10 02:54:14 JST
+ 2019-04-16 21:48:13 JST
</div>
</div>
</body>
|