diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 11:01:51 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 11:01:51 -0700 |
| commit | 23abd3f48cb217d1558fa1984bfa8c502717c08f (patch) | |
| tree | 10d4300c9700ee80d5538c4f302cac16aa7cd914 /Documentation | |
| parent | 01ed1079f3fae37eda7e0e0dcab9b74b34e9327e (diff) | |
| parent | 5d1e958e2467ef295637844fd85be7a8ab187ef1 (diff) | |
| download | git-23abd3f48cb217d1558fa1984bfa8c502717c08f.tar.gz | |
Merge branch 'js/objc-funchdr'
* js/objc-funchdr:
Teach git diff about Objective-C syntax
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 2ae771f2fb..26945593cb 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -315,6 +315,8 @@ patterns are available: - `java` suitable for source code in the Java language. +- `objc` suitable for source code in the Objective-C language. + - `pascal` suitable for source code in the Pascal/Delphi language. - `php` suitable for source code in the PHP language. |