diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-31 10:41:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 17:04:56 -0700 |
| commit | e910ce30e41ae4ddc20a64661e8cf2702433e5db (patch) | |
| tree | 054a851e0f797358bcbeddec3fe33a3307cd3400 /Documentation/gitattributes.txt | |
| parent | e1afaea9427d6b367a3e35b5f2cd7fbfb7148dab (diff) | |
| parent | d266a988456fcaab9918eae39f5faf8dcb20cb26 (diff) | |
| download | git-e910ce30e41ae4ddc20a64661e8cf2702433e5db.tar.gz git-e910ce30e41ae4ddc20a64661e8cf2702433e5db.tar.xz | |
Merge branch 'tr/rev-list-docs' into tr/filter-branch
This prepares the necessary parts to merge filter-branch
fix based on simplify-merges to master.
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index d7b41142d..db16b0ca5 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -307,9 +307,18 @@ backslash, and zero or more occurrences of `sub` followed by There are a few built-in patterns to make this easier, and `tex` is one of them, so you do not have to write the above in your configuration file (you still need to enable this with the -attribute mechanism, via `.gitattributes`). Another built-in -pattern is defined for `java` that defines a pattern suitable -for program text in Java language. +attribute mechanism, via `.gitattributes`). The following built in +patterns are available: + +- `bibtex` suitable for files with BibTeX coded references. + +- `java` suitable for source code in the Java lanugage. + +- `pascal` suitable for source code in the Pascal/Delphi language. + +- `ruby` suitable for source code in the Ruby language. + +- `tex` suitable for source code for LaTeX documents. Performing a three-way merge |