summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-05-08 21:25:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-05-08 21:25:01 (GMT)
commitdc4c3933b189f7c3087008d3dc2b16ef8325ab1b (patch)
tree9cba243af9814d38e4db9726679d4df86f4718f8 /Documentation
parent933fdf8784d0fedaa259c6caf90115cfa7d21184 (diff)
parent09dad9256a32affc4a3bc0cf1fa45d5fa6f51231 (diff)
downloadgit-dc4c3933b189f7c3087008d3dc2b16ef8325ab1b.zip
git-dc4c3933b189f7c3087008d3dc2b16ef8325ab1b.tar.gz
git-dc4c3933b189f7c3087008d3dc2b16ef8325ab1b.tar.bz2
Merge branch 'ah/userdiff-markdown'
The userdiff patterns for Markdown documents have been added. * ah/userdiff-markdown: userdiff: support Markdown
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 508fe71..2d0a037 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -824,6 +824,8 @@ patterns are available:
- `java` suitable for source code in the Java language.
+- `markdown` suitable for Markdown documents.
+
- `matlab` suitable for source code in the MATLAB and Octave languages.
- `objc` suitable for source code in the Objective-C language.