Skip to content

script/update-docs.rb: set {build_dir} correctly #1993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2025
Merged

script/update-docs.rb: set {build_dir} correctly #1993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 146 additions & 0 deletions external/docs/content/docs/git-config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3851,6 +3851,79 @@ <h3 id="_variables"><a class="anchor" href="#_variables"></a>Variables</h3>
built-in values. Any other value is treated as a custom diff tool
and requires that a corresponding difftool.&lt;guitool&gt;.cmd variable
is defined.</p>
<div class="ulist">
<ul>
<li>
<p>araxis</p>
</li>
<li>
<p>bc</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>
<p>emerge</p>
</li>
<li>
<p>examdiff</p>
</li>
<li>
<p>guiffy</p>
</li>
<li>
<p>gvimdiff</p>
</li>
<li>
<p>kdiff3</p>
</li>
<li>
<p>kompare</p>
</li>
<li>
<p>meld</p>
</li>
<li>
<p>nvimdiff</p>
</li>
<li>
<p>opendiff</p>
</li>
<li>
<p>p4merge</p>
</li>
<li>
<p>smerge</p>
</li>
<li>
<p>tkdiff</p>
</li>
<li>
<p>vimdiff</p>
</li>
<li>
<p>vscode</p>
</li>
<li>
<p>winmerge</p>
</li>
<li>
<p>xxdiff</p>
</li>
</ul>
</div>
</dd>
<dt class="hdlist1" id="Documentation/git-config.txt-difftoollttoolgtcmd"> <a class="anchor" href="#Documentation/git-config.txt-difftoollttoolgtcmd"></a>difftool.&lt;tool&gt;.cmd </dt>
<dd>
Expand Down Expand Up @@ -6221,6 +6294,79 @@ <h3 id="_variables"><a class="anchor" href="#_variables"></a>Variables</h3>
-g/--gui flag is specified. The list below shows the valid built-in values.
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>
<p>araxis</p>
</li>
<li>
<p>bc</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>
<p>emerge</p>
</li>
<li>
<p>examdiff</p>
</li>
<li>
<p>guiffy</p>
</li>
<li>
<p>gvimdiff</p>
</li>
<li>
<p>kdiff3</p>
</li>
<li>
<p>meld</p>
</li>
<li>
<p>nvimdiff</p>
</li>
<li>
<p>opendiff</p>
</li>
<li>
<p>p4merge</p>
</li>
<li>
<p>smerge</p>
</li>
<li>
<p>tkdiff</p>
</li>
<li>
<p>tortoisemerge</p>
</li>
<li>
<p>vimdiff</p>
</li>
<li>
<p>vscode</p>
</li>
<li>
<p>winmerge</p>
</li>
<li>
<p>xxdiff</p>
</li>
</ul>
</div>
</dd>
<dt class="hdlist1" id="Documentation/git-config.txt-mergeverbosity"> <a class="anchor" href="#Documentation/git-config.txt-mergeverbosity"></a>merge.verbosity </dt>
<dd>
Expand Down
146 changes: 146 additions & 0 deletions external/docs/content/docs/git-config/2.49.0.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3850,6 +3850,79 @@ <h3 id="_variables"><a class="anchor" href="#_variables"></a>Variables</h3>
built-in values. Any other value is treated as a custom diff tool
and requires that a corresponding difftool.&lt;guitool&gt;.cmd variable
is defined.</p>
<div class="ulist">
<ul>
<li>
<p>araxis</p>
</li>
<li>
<p>bc</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>
<p>emerge</p>
</li>
<li>
<p>examdiff</p>
</li>
<li>
<p>guiffy</p>
</li>
<li>
<p>gvimdiff</p>
</li>
<li>
<p>kdiff3</p>
</li>
<li>
<p>kompare</p>
</li>
<li>
<p>meld</p>
</li>
<li>
<p>nvimdiff</p>
</li>
<li>
<p>opendiff</p>
</li>
<li>
<p>p4merge</p>
</li>
<li>
<p>smerge</p>
</li>
<li>
<p>tkdiff</p>
</li>
<li>
<p>vimdiff</p>
</li>
<li>
<p>vscode</p>
</li>
<li>
<p>winmerge</p>
</li>
<li>
<p>xxdiff</p>
</li>
</ul>
</div>
</dd>
<dt class="hdlist1" id="Documentation/git-config.txt-difftoollttoolgtcmd"> <a class="anchor" href="#Documentation/git-config.txt-difftoollttoolgtcmd"></a>difftool.&lt;tool&gt;.cmd </dt>
<dd>
Expand Down Expand Up @@ -6220,6 +6293,79 @@ <h3 id="_variables"><a class="anchor" href="#_variables"></a>Variables</h3>
-g/--gui flag is specified. The list below shows the valid built-in values.
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>
<p>araxis</p>
</li>
<li>
<p>bc</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>
<p>emerge</p>
</li>
<li>
<p>examdiff</p>
</li>
<li>
<p>guiffy</p>
</li>
<li>
<p>gvimdiff</p>
</li>
<li>
<p>kdiff3</p>
</li>
<li>
<p>meld</p>
</li>
<li>
<p>nvimdiff</p>
</li>
<li>
<p>opendiff</p>
</li>
<li>
<p>p4merge</p>
</li>
<li>
<p>smerge</p>
</li>
<li>
<p>tkdiff</p>
</li>
<li>
<p>tortoisemerge</p>
</li>
<li>
<p>vimdiff</p>
</li>
<li>
<p>vscode</p>
</li>
<li>
<p>winmerge</p>
</li>
<li>
<p>xxdiff</p>
</li>
</ul>
</div>
</dd>
<dt class="hdlist1" id="Documentation/git-config.txt-mergeverbosity"> <a class="anchor" href="#Documentation/git-config.txt-mergeverbosity"></a>merge.verbosity </dt>
<dd>
Expand Down
73 changes: 73 additions & 0 deletions external/docs/content/docs/git-difftool.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,79 @@ <h2 id="_configuration"><a class="anchor" href="#_configuration"></a>CONFIGURATI
built-in values. Any other value is treated as a custom diff tool
and requires that a corresponding difftool.&lt;guitool&gt;.cmd variable
is defined.</p>
<div class="ulist">
<ul>
<li>
<p>araxis</p>
</li>
<li>
<p>bc</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>
<p>emerge</p>
</li>
<li>
<p>examdiff</p>
</li>
<li>
<p>guiffy</p>
</li>
<li>
<p>gvimdiff</p>
</li>
<li>
<p>kdiff3</p>
</li>
<li>
<p>kompare</p>
</li>
<li>
<p>meld</p>
</li>
<li>
<p>nvimdiff</p>
</li>
<li>
<p>opendiff</p>
</li>
<li>
<p>p4merge</p>
</li>
<li>
<p>smerge</p>
</li>
<li>
<p>tkdiff</p>
</li>
<li>
<p>vimdiff</p>
</li>
<li>
<p>vscode</p>
</li>
<li>
<p>winmerge</p>
</li>
<li>
<p>xxdiff</p>
</li>
</ul>
</div>
</dd>
<dt class="hdlist1" id="Documentation/git-difftool.txt-difftoollttoolgtcmd"> <a class="anchor" href="#Documentation/git-difftool.txt-difftoollttoolgtcmd"></a>difftool.&lt;tool&gt;.cmd </dt>
<dd>
Expand Down
Loading
Loading