From: Todd Zullinger <tmz@pobox.com>
To: git@vger.kernel.org
Cc: Patrick Steinhardt <ps@pks.im>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 3/3] contrib/subtree: rename .txt to .adoc
Date: Sat, 1 Mar 2025 10:36:04 -0500 [thread overview]
Message-ID: <20250301153607.95746-4-tmz@pobox.com> (raw)
In-Reply-To: <20250301153607.95746-1-tmz@pobox.com>
The .txt extensions were changed to .adoc in 1f010d6bdf (doc: use .adoc
extension for AsciiDoc files, 2025-01-20).
Do the same for contrib/subtree.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
---
contrib/subtree/Makefile | 2 +-
contrib/subtree/{git-subtree.txt => git-subtree.adoc} | 0
contrib/subtree/meson.build | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
rename contrib/subtree/{git-subtree.txt => git-subtree.adoc} (100%)
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 8fe0bfd401..c0c9f21cb7 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -50,7 +50,7 @@ GIT_SUBTREE := git-subtree
GIT_SUBTREE_DOC := git-subtree.1
GIT_SUBTREE_XML := git-subtree.xml
-GIT_SUBTREE_TXT := git-subtree.txt
+GIT_SUBTREE_TXT := git-subtree.adoc
GIT_SUBTREE_HTML := git-subtree.html
GIT_SUBTREE_TEST := ../../git-subtree
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.adoc
similarity index 100%
rename from contrib/subtree/git-subtree.txt
rename to contrib/subtree/git-subtree.adoc
diff --git a/contrib/subtree/meson.build b/contrib/subtree/meson.build
index a752a188df..9c72b23625 100644
--- a/contrib/subtree/meson.build
+++ b/contrib/subtree/meson.build
@@ -32,7 +32,7 @@ if get_option('docs').contains('man')
'@INPUT@',
],
depends: documentation_deps,
- input: 'git-subtree.txt',
+ input: 'git-subtree.adoc',
output: 'git-subtree.xml',
)
@@ -63,7 +63,7 @@ if get_option('docs').contains('html')
'@INPUT@',
],
depends: documentation_deps,
- input: 'git-subtree.txt',
+ input: 'git-subtree.adoc',
output: 'git-subtree.html',
install: true,
install_dir: get_option('datadir') / 'doc/git-doc',
--
2.49.0.rc0
next prev parent reply other threads:[~2025-03-01 15:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-28 3:47 [PATCH 0/3] doc: txt -> adoc fixes Todd Zullinger
2025-02-28 3:47 ` [PATCH 1/3] doc: update howto-index.sh for .adoc extensions Todd Zullinger
2025-02-28 13:55 ` Junio C Hamano
2025-02-28 3:47 ` [PATCH 2/3] contrib/contacts: rename .txt to .adoc Todd Zullinger
2025-02-28 8:13 ` Patrick Steinhardt
2025-02-28 13:57 ` Todd Zullinger
2025-02-28 18:47 ` Junio C Hamano
2025-03-01 15:34 ` Todd Zullinger
2025-02-28 3:47 ` [PATCH 3/3] contrib/subtree: " Todd Zullinger
2025-02-28 8:13 ` Patrick Steinhardt
2025-02-28 13:50 ` Todd Zullinger
2025-02-28 14:09 ` Patrick Steinhardt
2025-02-28 18:34 ` Junio C Hamano
2025-02-28 13:45 ` [PATCH 0/3] doc: txt -> adoc fixes Junio C Hamano
2025-03-01 15:36 ` [PATCH v2 " Todd Zullinger
2025-03-01 15:36 ` [PATCH v2 1/3] doc: update howto-index.sh for .adoc extensions Todd Zullinger
2025-03-01 15:36 ` [PATCH v2 2/3] contrib/contacts: rename .txt to .adoc Todd Zullinger
2025-03-01 15:36 ` Todd Zullinger [this message]
2025-03-01 18:02 ` [PATCH v2 0/3] doc: txt -> adoc fixes Junio C Hamano
2025-03-01 18:20 ` Junio C Hamano
2025-03-01 18:25 ` [PATCH v2 4/3] doc: fix build-docdep.perl Junio C Hamano
2025-03-01 19:41 ` Todd Zullinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250301153607.95746-4-tmz@pobox.com \
--to=tmz@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps@pks.im \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox