Remove obsolete ".txt" extensions for AsciiDoc files

Since we no longer have any AsciiDoc files that end in ".txt", don't
modify them with .gitattributes or ignore them with .gitignore.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/.gitattributes b/.gitattributes
index b38cfd499b363c9c38ec2fd9bd2e116748937c55..43fa883a84f173ebf6dcf17225903a4cca22d19d 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,7 +7,6 @@
 *.py text eol=lf diff=python
 *.bat text eol=crlf
 CODE_OF_CONDUCT.md -whitespace
-/Documentation/**/*.txt text eol=lf
 /Documentation/**/*.adoc text eol=lf
 /command-list.txt text eol=lf
 /GIT-VERSION-GEN text eol=lf

diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index abce806398fff45bb7db31021ca974d8c56f9c28..dd54cc768a250caf1a6777b5385fd6f3b7109c33 100644 (file)
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -6,14 +6,10 @@
 *.pdf
 git.info
 gitman.info
-howto-index.txt
 howto-index.adoc
 doc.dep
-cmds-*.txt
 cmds-*.adoc
-mergetools-*.txt
 mergetools-*.adoc
-SubmittingPatches.txt
 SubmittingPatches.adoc
 tmp-doc-diff/
 tmp-meson-diff/