aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/contacts/Makefile2
-rw-r--r--contrib/contacts/git-contacts.adoc (renamed from contrib/contacts/git-contacts.txt)0
-rw-r--r--contrib/contacts/meson.build4
-rwxr-xr-xcontrib/long-running-filter/example.pl2
-rw-r--r--contrib/subtree/Makefile2
-rw-r--r--contrib/subtree/git-subtree.adoc (renamed from contrib/subtree/git-subtree.txt)0
-rw-r--r--contrib/subtree/meson.build4
7 files changed, 7 insertions, 7 deletions
diff --git a/contrib/contacts/Makefile b/contrib/contacts/Makefile
index a2990f0dcb..9c4ca4f3bc 100644
--- a/contrib/contacts/Makefile
+++ b/contrib/contacts/Makefile
@@ -34,7 +34,7 @@ GIT_CONTACTS := git-contacts
GIT_CONTACTS_DOC := git-contacts.1
GIT_CONTACTS_XML := git-contacts.xml
-GIT_CONTACTS_TXT := git-contacts.txt
+GIT_CONTACTS_TXT := git-contacts.adoc
GIT_CONTACTS_HTML := git-contacts.html
doc: $(GIT_CONTACTS_DOC) $(GIT_CONTACTS_HTML)
diff --git a/contrib/contacts/git-contacts.txt b/contrib/contacts/git-contacts.adoc
index dd914d1261..dd914d1261 100644
--- a/contrib/contacts/git-contacts.txt
+++ b/contrib/contacts/git-contacts.adoc
diff --git a/contrib/contacts/meson.build b/contrib/contacts/meson.build
index 6ec92f47c4..73d82dfe52 100644
--- a/contrib/contacts/meson.build
+++ b/contrib/contacts/meson.build
@@ -16,7 +16,7 @@ if get_option('docs').contains('man')
'@INPUT@',
],
depends: documentation_deps,
- input: 'git-contacts.txt',
+ input: 'git-contacts.adoc',
output: 'git-contacts.xml',
)
@@ -47,7 +47,7 @@ if get_option('docs').contains('html')
'@INPUT@',
],
depends: documentation_deps,
- input: 'git-contacts.txt',
+ input: 'git-contacts.adoc',
output: 'git-contacts.html',
install: true,
install_dir: get_option('datadir') / 'doc/git-doc',
diff --git a/contrib/long-running-filter/example.pl b/contrib/long-running-filter/example.pl
index a677569ddd..4b83e4c5e8 100755
--- a/contrib/long-running-filter/example.pl
+++ b/contrib/long-running-filter/example.pl
@@ -1,7 +1,7 @@
#!/usr/bin/perl
#
# Example implementation for the Git filter protocol version 2
-# See Documentation/gitattributes.txt, section "Filter Protocol"
+# See Documentation/gitattributes.adoc, section "Filter Protocol"
#
# Please note, this pass-thru filter is a minimal skeleton. No proper
# error handling was implemented.
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
index 004abf415b..004abf415b 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/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',