Autogenerated HTML docs for v2.36.1-60-gb9de9

1 files changed, 358 insertions, 220 deletions

diff --git a/git-config.html b/git-config.html
index 29a8fe13a..09c49e31a 100644
--- a/git-config.html
+++ b/git-config.html
@@ -4821,173 +4821,200 @@ diff.guitool
         and requires that a corresponding difftool.<guitool>.cmd variable

         is defined.

 </p>

-<div class="ulist"><ul>

-<li>

-<p>

-araxis

-</p>

-</li>

-<li>

-<p>

-bc

-</p>

-</li>

-<li>

-<p>

-bc3

-</p>

-</li>

-<li>

-<p>

-bc4

-</p>

-</li>

-<li>

-<p>

-codecompare

-</p>

-</li>

-<li>

-<p>

-deltawalker

-</p>

-</li>

-<li>

-<p>

-diffmerge

-</p>

-</li>

-<li>

-<p>

-diffuse

-</p>

-</li>

-<li>

-<p>

-ecmerge

-</p>

-</li>

-<li>

+<div class="dlist"><dl>

+<dt class="hdlist1">

+<code>araxis</code>

+</dt>

+<dd>

 <p>

-emerge

+Use Araxis Merge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>bc</code>

+</dt>

+<dd>

 <p>

-examdiff

+Use Beyond Compare (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>bc3</code>

+</dt>

+<dd>

 <p>

-guiffy

+Use Beyond Compare (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>bc4</code>

+</dt>

+<dd>

 <p>

-gvimdiff

+Use Beyond Compare (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>codecompare</code>

+</dt>

+<dd>

 <p>

-gvimdiff1

+Use Code Compare (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>deltawalker</code>

+</dt>

+<dd>

 <p>

-gvimdiff2

+Use DeltaWalker (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>diffmerge</code>

+</dt>

+<dd>

 <p>

-gvimdiff3

+Use DiffMerge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>diffuse</code>

+</dt>

+<dd>

 <p>

-kdiff3

+Use Diffuse (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>ecmerge</code>

+</dt>

+<dd>

 <p>

-kompare

+Use ECMerge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>emerge</code>

+</dt>

+<dd>

 <p>

-meld

+Use Emacs' Emerge

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>examdiff</code>

+</dt>

+<dd>

 <p>

-nvimdiff

+Use ExamDiff Pro (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>guiffy</code>

+</dt>

+<dd>

 <p>

-nvimdiff1

+Use Guiffy&#8217;s Diff Tool (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>gvimdiff</code>

+</dt>

+<dd>

 <p>

-nvimdiff2

+Use gVim (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>kdiff3</code>

+</dt>

+<dd>

 <p>

-nvimdiff3

+Use KDiff3 (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>kompare</code>

+</dt>

+<dd>

 <p>

-opendiff

+Use Kompare (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>meld</code>

+</dt>

+<dd>

 <p>

-p4merge

+Use Meld (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>nvimdiff</code>

+</dt>

+<dd>

 <p>

-smerge

+Use Neovim

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>opendiff</code>

+</dt>

+<dd>

 <p>

-tkdiff

+Use FileMerge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>p4merge</code>

+</dt>

+<dd>

 <p>

-vimdiff

+Use HelixCore P4Merge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>smerge</code>

+</dt>

+<dd>

 <p>

-vimdiff1

+Use Sublime Merge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>tkdiff</code>

+</dt>

+<dd>

 <p>

-vimdiff2

+Use TkDiff (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>vimdiff</code>

+</dt>

+<dd>

 <p>

-vimdiff3

+Use Vim

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>winmerge</code>

+</dt>

+<dd>

 <p>

-winmerge

+Use WinMerge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>xxdiff</code>

+</dt>

+<dd>

 <p>

-xxdiff

+Use xxdiff (requires a graphical session)

 </p>

-</li>

-</ul></div>

+</dd>

+</dl></div>

 </dd>

 <dt class="hdlist1">

 diff.indentHeuristic

@@ -7867,173 +7894,272 @@ merge.guitool
         Any other value is treated as a custom merge tool and requires that a

         corresponding mergetool.&lt;guitool&gt;.cmd variable is defined.

 </p>

-<div class="ulist"><ul>

-<li>

+<div class="dlist"><dl>

+<dt class="hdlist1">

+<code>araxis</code>

+</dt>

+<dd>

 <p>

-araxis

+Use Araxis Merge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>bc</code>

+</dt>

+<dd>

 <p>

-bc

+Use Beyond Compare (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>bc3</code>

+</dt>

+<dd>

 <p>

-bc3

+Use Beyond Compare (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>bc4</code>

+</dt>

+<dd>

 <p>

-bc4

+Use Beyond Compare (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>codecompare</code>

+</dt>

+<dd>

 <p>

-codecompare

+Use Code Compare (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>deltawalker</code>

+</dt>

+<dd>

 <p>

-deltawalker

+Use DeltaWalker (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>diffmerge</code>

+</dt>

+<dd>

 <p>

-diffmerge

+Use DiffMerge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>diffuse</code>

+</dt>

+<dd>

 <p>

-diffuse

+Use Diffuse (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>ecmerge</code>

+</dt>

+<dd>

 <p>

-ecmerge

+Use ECMerge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>emerge</code>

+</dt>

+<dd>

 <p>

-emerge

+Use Emacs' Emerge

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>examdiff</code>

+</dt>

+<dd>

 <p>

-examdiff

+Use ExamDiff Pro (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>guiffy</code>

+</dt>

+<dd>

 <p>

-guiffy

+Use Guiffy&#8217;s Diff Tool (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>gvimdiff</code>

+</dt>

+<dd>

 <p>

-gvimdiff

+Use gVim (requires a graphical session) with a custom layout (see <code>git help mergetool</code>'s <code>BACKEND SPECIFIC HINTS</code> section)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>gvimdiff1</code>

+</dt>

+<dd>

 <p>

-gvimdiff1

+Use gVim (requires a graphical session) with a 2 panes layout (LOCAL and REMOTE)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>gvimdiff2</code>

+</dt>

+<dd>

 <p>

-gvimdiff2

+Use gVim (requires a graphical session) with a 3 panes layout (LOCAL, MERGED and REMOTE)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>gvimdiff3</code>

+</dt>

+<dd>

 <p>

-gvimdiff3

+Use gVim (requires a graphical session) where only the MERGED file is shown

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>kdiff3</code>

+</dt>

+<dd>

 <p>

-kdiff3

+Use KDiff3 (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>meld</code>

+</dt>

+<dd>

 <p>

-meld

+Use Meld (requires a graphical session) with optional <code>auto merge</code> (see <code>git help mergetool</code>'s <code>CONFIGURATION</code> section)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>nvimdiff</code>

+</dt>

+<dd>

 <p>

-nvimdiff

+Use Neovim with a custom layout (see <code>git help mergetool</code>'s <code>BACKEND SPECIFIC HINTS</code> section)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>nvimdiff1</code>

+</dt>

+<dd>

 <p>

-nvimdiff1

+Use Neovim with a 2 panes layout (LOCAL and REMOTE)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>nvimdiff2</code>

+</dt>

+<dd>

 <p>

-nvimdiff2

+Use Neovim with a 3 panes layout (LOCAL, MERGED and REMOTE)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>nvimdiff3</code>

+</dt>

+<dd>

 <p>

-nvimdiff3

+Use Neovim where only the MERGED file is shown

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>opendiff</code>

+</dt>

+<dd>

 <p>

-opendiff

+Use FileMerge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>p4merge</code>

+</dt>

+<dd>

 <p>

-p4merge

+Use HelixCore P4Merge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>smerge</code>

+</dt>

+<dd>

 <p>

-smerge

+Use Sublime Merge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>tkdiff</code>

+</dt>

+<dd>

 <p>

-tkdiff

+Use TkDiff (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>tortoisemerge</code>

+</dt>

+<dd>

 <p>

-tortoisemerge

+Use TortoiseMerge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>vimdiff</code>

+</dt>

+<dd>

 <p>

-vimdiff

+Use Vim with a custom layout (see <code>git help mergetool</code>'s <code>BACKEND SPECIFIC HINTS</code> section)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>vimdiff1</code>

+</dt>

+<dd>

 <p>

-vimdiff1

+Use Vim with a 2 panes layout (LOCAL and REMOTE)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>vimdiff2</code>

+</dt>

+<dd>

 <p>

-vimdiff2

+Use Vim with a 3 panes layout (LOCAL, MERGED and REMOTE)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>vimdiff3</code>

+</dt>

+<dd>

 <p>

-vimdiff3

+Use Vim where only the MERGED file is shown

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>winmerge</code>

+</dt>

+<dd>

 <p>

-winmerge

+Use WinMerge (requires a graphical session)

 </p>

-</li>

-<li>

+</dd>

+<dt class="hdlist1">

+<code>xxdiff</code>

+</dt>

+<dd>

 <p>

-xxdiff

+Use xxdiff (requires a graphical session)

 </p>

-</li>

-</ul></div>

+</dd>

+</dl></div>

 </dd>

 <dt class="hdlist1">

 merge.verbosity

@@ -8154,6 +8280,18 @@ mergetool.meld.useAutoMerge
 </p>

 </dd>

 <dt class="hdlist1">

+mergetool.vimdiff.layout

+</dt>

+<dd>

+<p>

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

+        windows look like. 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.

+</p>

+</dd>

+<dt class="hdlist1">

 mergetool.hideResolved

 </dt>

 <dd>