diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-05-09 00:25:01 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-05-09 00:25:01 +0300 |
commit | dc4c3933b189f7c3087008d3dc2b16ef8325ab1b (patch) | |
tree | 9cba243af9814d38e4db9726679d4df86f4718f8 /Documentation | |
parent | 933fdf8784d0fedaa259c6caf90115cfa7d21184 (diff) | |
parent | 09dad9256a32affc4a3bc0cf1fa45d5fa6f51231 (diff) |
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.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 508fe713c4..2d0a03715b 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. |