undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitattributes: Document built in hunk header patterns

Browse Source 
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>
This commit is contained in:
Gustaf Hendeby 2008-08-12 16:24:25 +02:00 committed by Junio C Hamano
parent bd7b371e9c
commit d08ed6d692
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/gitattributes.txt
View File

@ -307,9 +307,16 @@ backslash, and zero or more occurrences of `sub` followed by
There are a few built-in patterns to make this easier, and `tex` 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 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 configuration file (you still need to enable this with the
attribute mechanism, via `.gitattributes`). Another built-in attribute mechanism, via `.gitattributes`). The following built in
pattern is defined for `java` that defines a pattern suitable patterns are available:
for program text in Java language.
- `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 Performing a three-way merge