summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bd7b371)
raw | patch | inline | side by side (parent: bd7b371)
author | Gustaf Hendeby <hendeby@isy.liu.se> | |
Tue, 12 Aug 2008 14:24:25 +0000 (16:24 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 12 Aug 2008 22:41:32 +0000 (15:41 -0700) |
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>
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>
Documentation/gitattributes.txt | patch | blob | history |
index d7b41142d2c843bc5460f03c73c609b1c53ff4a6..c61a58d8f2e57eb8a193feb8e408e0bee278c918 100644 (file)
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:
+
+- `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