]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 82deaae) | patch
.gitattributes: more *.txt -> *.adoc updates
authorTodd Zullinger <tmz@pobox.com>
Mon, 3 Mar 2025 20:44:00 +0000 (15:44 -0500)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Mar 2025 21:49:19 +0000 (13:49 -0800)
commit33af5a333416317f5d1fe0c8c9f980617a413aa8
tree7c07a6c6d91cd46a7147851758df0bfd199ecfa0tree
parent82deaae3b94d59caf13ea21c980ab386df6dac9ecommit | diff
.gitattributes: more *.txt -> *.adoc updates

All Documentation files now end in .adoc.  Update the entries for
git-merge.adoc, gitk.adoc, and user-manual.adoc to properly set the
conflict-marker-size attribute.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
.gitattributes diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.