Autogenerated HTML docs for v2.25.1-460-g2f268

1 files changed, 24 insertions, 9 deletions

diff --git a/git-config.html b/git-config.html
index 38f30c4a1..0c4740acf 100644
--- a/git-config.html
+++ b/git-config.html
@@ -7878,18 +7878,22 @@ push.pushOption
 higher priority configuration file (e.g. <code>.git/config</code> in a

 repository) to clear the values inherited from a lower priority

 configuration files (e.g. <code>$HOME/.gitconfig</code>).</p></div>

-<div class="openblock">

+<div class="listingblock">

 <div class="content">

-<div class="paragraph"><p>Example:</p></div>

-<div class="paragraph"><p>/etc/gitconfig

+<pre><code>Example:

+

+/etc/gitconfig

   push.pushoption = a

-  push.pushoption = b</p></div>

-<div class="paragraph"><p>~/.gitconfig

-  push.pushoption = c</p></div>

-<div class="paragraph"><p>repo/.git/config

+  push.pushoption = b

+

+~/.gitconfig

+  push.pushoption = c

+

+repo/.git/config

   push.pushoption =

-  push.pushoption = b</p></div>

-<div class="paragraph"><p>This will result in only b (a and c are cleared).</p></div>

+  push.pushoption = b

+

+This will result in only b (a and c are cleared).</code></pre>

 </div></div>

 </dd>

 <dt class="hdlist1">

@@ -7924,6 +7928,17 @@ rebase.useBuiltin
 </p>

 </dd>

 <dt class="hdlist1">

+rebase.backend

+</dt>

+<dd>

+<p>

+        Default backend to use for rebasing.  Possible choices are

+        <em>apply</em> or <em>merge</em>.  In the future, if the merge backend gains

+        all remaining capabilities of the apply backend, this setting

+        may become unused.

+</p>

+</dd>

+<dt class="hdlist1">

 rebase.stat

 </dt>

 <dd>