Skip to content

Commit ec3abdd

Browse files
To1neTo1ne
committed
script/update-docs.rb: set {build_dir} correctly
Some files use the `include::` directive to include content from another file into the current document. In Git's commit 9219325be74 (Documentation: allow sourcing generated includes from separate dir, 2024-12-06) the use of {build_dir} was introduced. In d51c252 (update-docs: accommodate for changes in Git v2.48.0, 2025-01-22) these issues were addressed, but when {build_dir} was used in a file in a subdir in Documentation/ then this still gets messed up. Replace {build_dir} by 'Documentation' so including files in {build_dir} works correctly everywhere. Signed-off-by: Toon Claes <[email protected]>
1 parent 47960c2 commit ec3abdd

File tree

9 files changed

+2173
-7
lines changed

9 files changed

+2173
-7
lines changed

‎external/docs/content/docs/git-config.html‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3851,6 +3851,79 @@ <h3 id="_variables"><a class="anchor" href="#_variables"></a>Variables</h3>
38513851
built-in values. Any other value is treated as a custom diff tool
38523852
and requires that a corresponding difftool.&lt;guitool&gt;.cmd variable
38533853
is defined.</p>
3854+
<div class="ulist">
3855+
<ul>
3856+
<li>
3857+
<p>araxis</p>
3858+
</li>
3859+
<li>
3860+
<p>bc</p>
3861+
</li>
3862+
<li>
3863+
<p>codecompare</p>
3864+
</li>
3865+
<li>
3866+
<p>deltawalker</p>
3867+
</li>
3868+
<li>
3869+
<p>diffmerge</p>
3870+
</li>
3871+
<li>
3872+
<p>diffuse</p>
3873+
</li>
3874+
<li>
3875+
<p>ecmerge</p>
3876+
</li>
3877+
<li>
3878+
<p>emerge</p>
3879+
</li>
3880+
<li>
3881+
<p>examdiff</p>
3882+
</li>
3883+
<li>
3884+
<p>guiffy</p>
3885+
</li>
3886+
<li>
3887+
<p>gvimdiff</p>
3888+
</li>
3889+
<li>
3890+
<p>kdiff3</p>
3891+
</li>
3892+
<li>
3893+
<p>kompare</p>
3894+
</li>
3895+
<li>
3896+
<p>meld</p>
3897+
</li>
3898+
<li>
3899+
<p>nvimdiff</p>
3900+
</li>
3901+
<li>
3902+
<p>opendiff</p>
3903+
</li>
3904+
<li>
3905+
<p>p4merge</p>
3906+
</li>
3907+
<li>
3908+
<p>smerge</p>
3909+
</li>
3910+
<li>
3911+
<p>tkdiff</p>
3912+
</li>
3913+
<li>
3914+
<p>vimdiff</p>
3915+
</li>
3916+
<li>
3917+
<p>vscode</p>
3918+
</li>
3919+
<li>
3920+
<p>winmerge</p>
3921+
</li>
3922+
<li>
3923+
<p>xxdiff</p>
3924+
</li>
3925+
</ul>
3926+
</div>
38543927
</dd>
38553928
<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>
38563929
<dd>
@@ -6221,6 +6294,79 @@ <h3 id="_variables"><a class="anchor" href="#_variables"></a>Variables</h3>
62216294
-g/--gui flag is specified. The list below shows the valid built-in values.
62226295
Any other value is treated as a custom merge tool and requires that a
62236296
corresponding mergetool.&lt;guitool&gt;.cmd variable is defined.</p>
6297+
<div class="ulist">
6298+
<ul>
6299+
<li>
6300+
<p>araxis</p>
6301+
</li>
6302+
<li>
6303+
<p>bc</p>
6304+
</li>
6305+
<li>
6306+
<p>codecompare</p>
6307+
</li>
6308+
<li>
6309+
<p>deltawalker</p>
6310+
</li>
6311+
<li>
6312+
<p>diffmerge</p>
6313+
</li>
6314+
<li>
6315+
<p>diffuse</p>
6316+
</li>
6317+
<li>
6318+
<p>ecmerge</p>
6319+
</li>
6320+
<li>
6321+
<p>emerge</p>
6322+
</li>
6323+
<li>
6324+
<p>examdiff</p>
6325+
</li>
6326+
<li>
6327+
<p>guiffy</p>
6328+
</li>
6329+
<li>
6330+
<p>gvimdiff</p>
6331+
</li>
6332+
<li>
6333+
<p>kdiff3</p>
6334+
</li>
6335+
<li>
6336+
<p>meld</p>
6337+
</li>
6338+
<li>
6339+
<p>nvimdiff</p>
6340+
</li>
6341+
<li>
6342+
<p>opendiff</p>
6343+
</li>
6344+
<li>
6345+
<p>p4merge</p>
6346+
</li>
6347+
<li>
6348+
<p>smerge</p>
6349+
</li>
6350+
<li>
6351+
<p>tkdiff</p>
6352+
</li>
6353+
<li>
6354+
<p>tortoisemerge</p>
6355+
</li>
6356+
<li>
6357+
<p>vimdiff</p>
6358+
</li>
6359+
<li>
6360+
<p>vscode</p>
6361+
</li>
6362+
<li>
6363+
<p>winmerge</p>
6364+
</li>
6365+
<li>
6366+
<p>xxdiff</p>
6367+
</li>
6368+
</ul>
6369+
</div>
62246370
</dd>
62256371
<dt class="hdlist1" id="Documentation/git-config.txt-mergeverbosity"> <a class="anchor" href="#Documentation/git-config.txt-mergeverbosity"></a>merge.verbosity </dt>
62266372
<dd>

‎external/docs/content/docs/git-config/2.49.0.html‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3850,6 +3850,79 @@ <h3 id="_variables"><a class="anchor" href="#_variables"></a>Variables</h3>
38503850
built-in values. Any other value is treated as a custom diff tool
38513851
and requires that a corresponding difftool.&lt;guitool&gt;.cmd variable
38523852
is defined.</p>
3853+
<div class="ulist">
3854+
<ul>
3855+
<li>
3856+
<p>araxis</p>
3857+
</li>
3858+
<li>
3859+
<p>bc</p>
3860+
</li>
3861+
<li>
3862+
<p>codecompare</p>
3863+
</li>
3864+
<li>
3865+
<p>deltawalker</p>
3866+
</li>
3867+
<li>
3868+
<p>diffmerge</p>
3869+
</li>
3870+
<li>
3871+
<p>diffuse</p>
3872+
</li>
3873+
<li>
3874+
<p>ecmerge</p>
3875+
</li>
3876+
<li>
3877+
<p>emerge</p>
3878+
</li>
3879+
<li>
3880+
<p>examdiff</p>
3881+
</li>
3882+
<li>
3883+
<p>guiffy</p>
3884+
</li>
3885+
<li>
3886+
<p>gvimdiff</p>
3887+
</li>
3888+
<li>
3889+
<p>kdiff3</p>
3890+
</li>
3891+
<li>
3892+
<p>kompare</p>
3893+
</li>
3894+
<li>
3895+
<p>meld</p>
3896+
</li>
3897+
<li>
3898+
<p>nvimdiff</p>
3899+
</li>
3900+
<li>
3901+
<p>opendiff</p>
3902+
</li>
3903+
<li>
3904+
<p>p4merge</p>
3905+
</li>
3906+
<li>
3907+
<p>smerge</p>
3908+
</li>
3909+
<li>
3910+
<p>tkdiff</p>
3911+
</li>
3912+
<li>
3913+
<p>vimdiff</p>
3914+
</li>
3915+
<li>
3916+
<p>vscode</p>
3917+
</li>
3918+
<li>
3919+
<p>winmerge</p>
3920+
</li>
3921+
<li>
3922+
<p>xxdiff</p>
3923+
</li>
3924+
</ul>
3925+
</div>
38533926
</dd>
38543927
<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>
38553928
<dd>
@@ -6220,6 +6293,79 @@ <h3 id="_variables"><a class="anchor" href="#_variables"></a>Variables</h3>
62206293
-g/--gui flag is specified. The list below shows the valid built-in values.
62216294
Any other value is treated as a custom merge tool and requires that a
62226295
corresponding mergetool.&lt;guitool&gt;.cmd variable is defined.</p>
6296+
<div class="ulist">
6297+
<ul>
6298+
<li>
6299+
<p>araxis</p>
6300+
</li>
6301+
<li>
6302+
<p>bc</p>
6303+
</li>
6304+
<li>
6305+
<p>codecompare</p>
6306+
</li>
6307+
<li>
6308+
<p>deltawalker</p>
6309+
</li>
6310+
<li>
6311+
<p>diffmerge</p>
6312+
</li>
6313+
<li>
6314+
<p>diffuse</p>
6315+
</li>
6316+
<li>
6317+
<p>ecmerge</p>
6318+
</li>
6319+
<li>
6320+
<p>emerge</p>
6321+
</li>
6322+
<li>
6323+
<p>examdiff</p>
6324+
</li>
6325+
<li>
6326+
<p>guiffy</p>
6327+
</li>
6328+
<li>
6329+
<p>gvimdiff</p>
6330+
</li>
6331+
<li>
6332+
<p>kdiff3</p>
6333+
</li>
6334+
<li>
6335+
<p>meld</p>
6336+
</li>
6337+
<li>
6338+
<p>nvimdiff</p>
6339+
</li>
6340+
<li>
6341+
<p>opendiff</p>
6342+
</li>
6343+
<li>
6344+
<p>p4merge</p>
6345+
</li>
6346+
<li>
6347+
<p>smerge</p>
6348+
</li>
6349+
<li>
6350+
<p>tkdiff</p>
6351+
</li>
6352+
<li>
6353+
<p>tortoisemerge</p>
6354+
</li>
6355+
<li>
6356+
<p>vimdiff</p>
6357+
</li>
6358+
<li>
6359+
<p>vscode</p>
6360+
</li>
6361+
<li>
6362+
<p>winmerge</p>
6363+
</li>
6364+
<li>
6365+
<p>xxdiff</p>
6366+
</li>
6367+
</ul>
6368+
</div>
62236369
</dd>
62246370
<dt class="hdlist1" id="Documentation/git-config.txt-mergeverbosity"> <a class="anchor" href="#Documentation/git-config.txt-mergeverbosity"></a>merge.verbosity </dt>
62256371
<dd>

‎external/docs/content/docs/git-difftool.html‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,79 @@ <h2 id="_configuration"><a class="anchor" href="#_configuration"></a>CONFIGURATI
190190
built-in values. Any other value is treated as a custom diff tool
191191
and requires that a corresponding difftool.&lt;guitool&gt;.cmd variable
192192
is defined.</p>
193+
<div class="ulist">
194+
<ul>
195+
<li>
196+
<p>araxis</p>
197+
</li>
198+
<li>
199+
<p>bc</p>
200+
</li>
201+
<li>
202+
<p>codecompare</p>
203+
</li>
204+
<li>
205+
<p>deltawalker</p>
206+
</li>
207+
<li>
208+
<p>diffmerge</p>
209+
</li>
210+
<li>
211+
<p>diffuse</p>
212+
</li>
213+
<li>
214+
<p>ecmerge</p>
215+
</li>
216+
<li>
217+
<p>emerge</p>
218+
</li>
219+
<li>
220+
<p>examdiff</p>
221+
</li>
222+
<li>
223+
<p>guiffy</p>
224+
</li>
225+
<li>
226+
<p>gvimdiff</p>
227+
</li>
228+
<li>
229+
<p>kdiff3</p>
230+
</li>
231+
<li>
232+
<p>kompare</p>
233+
</li>
234+
<li>
235+
<p>meld</p>
236+
</li>
237+
<li>
238+
<p>nvimdiff</p>
239+
</li>
240+
<li>
241+
<p>opendiff</p>
242+
</li>
243+
<li>
244+
<p>p4merge</p>
245+
</li>
246+
<li>
247+
<p>smerge</p>
248+
</li>
249+
<li>
250+
<p>tkdiff</p>
251+
</li>
252+
<li>
253+
<p>vimdiff</p>
254+
</li>
255+
<li>
256+
<p>vscode</p>
257+
</li>
258+
<li>
259+
<p>winmerge</p>
260+
</li>
261+
<li>
262+
<p>xxdiff</p>
263+
</li>
264+
</ul>
265+
</div>
193266
</dd>
194267
<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>
195268
<dd>

0 commit comments

Comments
 (0)