diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 11:01:29 -0700 |
| commit | c12401705c41a216e3ef777f6faaf192b974aabe (patch) | |
| tree | 84f416c513ec96dbdfa5a968bc353b0bcd2ccb8e /Documentation | |
| parent | b6d323f1646d7204fc6693071e5be84377ece70b (diff) | |
| parent | 69f9c87d4654aad8011444727194c3053827ae07 (diff) | |
| download | git-c12401705c41a216e3ef777f6faaf192b974aabe.tar.gz | |
Merge branch 'zb/userdiff-fountain'
New userdiff pattern definition for fountain screenwriting markup
format.
* zb/userdiff-fountain:
userdiff: add support for Fountain documents
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 81fe586948..e3b1de8033 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -527,6 +527,8 @@ patterns are available: - `fortran` suitable for source code in the Fortran language. +- `fountain` suitable for Fountain documents. + - `html` suitable for HTML/XHTML documents. - `java` suitable for source code in the Java language. |