Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-08 23:36:30 +0300
committerJunio C Hamano <gitster@pobox.com>2018-03-08 23:36:30 +0300
commit077cde91d226c305523645a0f30b6955d4aaf9c9 (patch)
tree5b6ae638094a55a11f75a760fa5cd82cf40bce88 /Documentation
parent9bb8eb0c88d210d3575bd484320f9abfef551ed1 (diff)
parent1dbf0c0ad6cabfc35aa1896b4d94f4ee811ba803 (diff)
Merge branch 'ag/userdiff-go-funcname'
"git diff" and friends learned funcname patterns for Go language source files. * ag/userdiff-go-funcname: userdiff: add built-in pattern for golang
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitattributes.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index c21f5ca109..d52b254a22 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -714,6 +714,8 @@ patterns are available:
- `fountain` suitable for Fountain documents.
+- `golang` suitable for source code in the Go language.
+
- `html` suitable for HTML/XHTML documents.
- `java` suitable for source code in the Java language.