gitattributes: Document built in hunk header patterns
Since the hunk header pattern text was written patterns for Ruby and Pascal/Delphi have been added. For users to be able to find them they should be documented not only in code. Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Gustaf Hendeby committed
Aug 12, 2008 at 16:24 UTC
d08ed6d692a79eb2a62410d7e76380fbf25ca793
1 file changed
+10
-3
Documentation/gitattributes.txt
+10
-3
@@ -307,9 +307,16 @@ backslash, and zero or more occurrences of `sub` followed by
307
There are a few built-in patterns to make this easier, and `tex`
308
is one of them, so you do not have to write the above in your
309
configuration file (you still need to enable this with the
310
-attribute mechanism, via `.gitattributes`). Another built-in
311
-pattern is defined for `java` that defines a pattern suitable
312
-for program text in Java language.
310
+attribute mechanism, via `.gitattributes`). The following built in
311
+patterns are available:
312
+
313
+- `java` suitable for source code in the Java lanugage.
314
+
315
+- `pascal` suitable for source code in the Pascal/Delphi language.
316
+
317
+- `ruby` suitable for source code in the Ruby language.
318
+
319
+- `tex` suitable for source code for LaTeX documents.
320
321
322
Performing a three-way merge