Autogenerated HTML docs for v2.28.0-585-ge1cff

1 files changed, 16 insertions, 1 deletions

diff --git a/git-config.html b/git-config.html
index c06723e20..5e323218e 100644
--- a/git-config.html
+++ b/git-config.html
@@ -2635,7 +2635,7 @@ core.deltaBaseCacheLimit
 </dt>

 <dd>

 <p>

-        Maximum number of bytes to reserve for caching base objects

+        Maximum number of bytes per thread to reserve for caching base objects

         that may be referenced by multiple deltified objects.  By storing the

         entire decompressed base objects in a cache Git is able

         to avoid unpacking and decompressing frequently used base

@@ -7155,6 +7155,21 @@ mergetool.meld.hasOutput
 </p>

 </dd>

 <dt class="hdlist1">

+mergetool.meld.useAutoMerge

+</dt>

+<dd>

+<p>

+        When the <code>--auto-merge</code> is given, meld will merge all non-conflicting

+        parts automatically, highlight the conflicting parts and wait for

+        user decision.  Setting <code>mergetool.meld.useAutoMerge</code> to <code>true</code> tells

+        Git to unconditionally use the <code>--auto-merge</code> option with <code>meld</code>.

+        Setting this value to <code>auto</code> makes git detect whether <code>--auto-merge</code>

+        is supported and will only use <code>--auto-merge</code> when available.  A

+        value of <code>false</code> avoids using <code>--auto-merge</code> altogether, and is the

+        default value.

+</p>

+</dd>

+<dt class="hdlist1">

 mergetool.keepBackup

 </dt>

 <dd>