diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-03-05 10:37:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-05 10:37:45 -0800 |
| commit | 22fab08fb88f4d8a4ddf1bd7a28dda13311dd26f (patch) | |
| tree | 9319777c546583807362f2733a6c6f15d417c503 /Documentation/howto/meson.build | |
| parent | cdf458c60eaaced338990f2aad96341a05836236 (diff) | |
| parent | 87eccc3a81d133e636150268c24d2220cad70fe5 (diff) | |
| download | git-22fab08fb88f4d8a4ddf1bd7a28dda13311dd26f.tar.gz | |
Merge branch 'pw/build-meson-technical-and-howto-docs'
Meson-based build procedure forgot to build some docs, which has
been corrected.
* pw/build-meson-technical-and-howto-docs:
meson: fix building technical and howto docs
Diffstat (limited to 'Documentation/howto/meson.build')
| -rw-r--r-- | Documentation/howto/meson.build | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Documentation/howto/meson.build b/Documentation/howto/meson.build index 92a08b13ee..81000028c0 100644 --- a/Documentation/howto/meson.build +++ b/Documentation/howto/meson.build @@ -1,20 +1,20 @@ howto_sources = [ - 'coordinate-embargoed-releases.txt', - 'keep-canonical-history-correct.txt', - 'maintain-git.txt', - 'new-command.txt', - 'rebase-from-internal-branch.txt', - 'rebuild-from-update-hook.txt', - 'recover-corrupted-blob-object.txt', - 'recover-corrupted-object-harder.txt', - 'revert-a-faulty-merge.txt', - 'revert-branch-rebase.txt', - 'separating-topic-branches.txt', - 'setup-git-server-over-http.txt', - 'update-hook-example.txt', - 'use-git-daemon.txt', - 'using-merge-subtree.txt', - 'using-signed-tag-in-pull-request.txt', + 'coordinate-embargoed-releases.adoc', + 'keep-canonical-history-correct.adoc', + 'maintain-git.adoc', + 'new-command.adoc', + 'rebase-from-internal-branch.adoc', + 'rebuild-from-update-hook.adoc', + 'recover-corrupted-blob-object.adoc', + 'recover-corrupted-object-harder.adoc', + 'revert-a-faulty-merge.adoc', + 'revert-branch-rebase.adoc', + 'separating-topic-branches.adoc', + 'setup-git-server-over-http.adoc', + 'update-hook-example.adoc', + 'use-git-daemon.adoc', + 'using-merge-subtree.adoc', + 'using-signed-tag-in-pull-request.adoc', ] howto_index = custom_target( @@ -26,7 +26,7 @@ howto_index = custom_target( env: script_environment, capture: true, input: howto_sources, - output: 'howto-index.txt', + output: 'howto-index.adoc', ) custom_target( |