aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-06-21 11:24:08 -0700
committerJunio C Hamano <gitster@pobox.com>2019-06-21 11:24:08 -0700
commita41dad4330c8291893b5c5b013457499855ec9b5 (patch)
tree21b5ec00fedc07883eee26ca823d516477e4fc10 /Documentation/gitattributes.txt
parenta6a95cd1b46e48e5fe06bdbb0839a67ebeef4682 (diff)
parent33be7b38c23fbbaf75197f6150323e0d4c84bf12 (diff)
downloadgit-a41dad4330c8291893b5c5b013457499855ec9b5.tar.gz
Merge branch 'ml/userdiff-rust'
The pattern "git diff/grep" use to extract funcname and words boundary for Rust has been added. * ml/userdiff-rust: userdiff: two simplifications of patterns for rust userdiff: add built-in pattern for rust
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index e387cc6dda..2796dfc83b 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -833,6 +833,8 @@ patterns are available:
- `ruby` suitable for source code in the Ruby language.
+- `rust` suitable for source code in the Rust language.
+
- `tex` suitable for source code for LaTeX documents.