diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-03-08 12:36:30 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-08 12:36:30 -0800 |
commit | 077cde91d226c305523645a0f30b6955d4aaf9c9 (patch) | |
tree | 5b6ae638094a55a11f75a760fa5cd82cf40bce88 /Documentation | |
parent | Merge branch 'ab/gc-auto-in-commit' (diff) | |
parent | userdiff: add built-in pattern for golang (diff) | |
download | tgif-077cde91d226c305523645a0f30b6955d4aaf9c9.tar.xz |
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.txt | 2 |
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. |