Autogenerated HTML docs for v2.44.0-53-g0f9d4

1 files changed, 11 insertions, 9 deletions

diff --git a/git-config.html b/git-config.html
index ec710d3a0..adfb8b18d 100644
--- a/git-config.html
+++ b/git-config.html
@@ -7921,9 +7921,7 @@ interactive.singleKey
         Currently this is used by the <code>--patch</code> mode of

         <a href="git-add.html">git-add(1)</a>, <a href="git-checkout.html">git-checkout(1)</a>,

         <a href="git-restore.html">git-restore(1)</a>, <a href="git-commit.html">git-commit(1)</a>,

-        <a href="git-reset.html">git-reset(1)</a>, and <a href="git-stash.html">git-stash(1)</a>. Note that this

-        setting is silently ignored if portable keystroke input

-        is not available; requires the Perl module Term::ReadKey.

+        <a href="git-reset.html">git-reset(1)</a>, and <a href="git-stash.html">git-stash(1)</a>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -8827,15 +8825,19 @@ mergetool.meld.useAutoMerge
 </p>

 </dd>

 <dt class="hdlist1">

-mergetool.vimdiff.layout

+mergetool.&lt;vimdiff variant&gt;.layout

 </dt>

 <dd>

 <p>

-        The vimdiff backend uses this variable to control how its split

-        windows appear. Applies even if you are using Neovim (<code>nvim</code>) or

-        gVim (<code>gvim</code>) as the merge tool. See BACKEND SPECIFIC HINTS section

-        in <a href="git-mergetool.html">git-mergetool(1)</a>.

-        for details.

+        Configure the split window layout for vimdiff&#8217;s <code>&lt;variant&gt;</code>, which is any of <code>vimdiff</code>,

+        <code>nvimdiff</code>, <code>gvimdiff</code>.

+        Upon launching <code>git mergetool</code> with <code>--tool=&lt;variant&gt;</code> (or without <code>--tool</code>

+        if <code>merge.tool</code> is configured as <code>&lt;variant&gt;</code>), Git will consult

+        <code>mergetool.&lt;variant&gt;.layout</code> to determine the tool&#8217;s layout. If the

+        variant-specific configuration is not available, <code>vimdiff</code>'s is used as

+        fallback.  If that too is not available, a default layout with 4 windows

+        will be used.  To configure the layout, see the <code>BACKEND SPECIFIC HINTS</code>

+        section in <a href="git-mergetool.html">git-mergetool(1)</a>.

 </p>

 </dd>

 <dt class="hdlist1">