diff options
| author |  Brandon Casey <drafnel@gmail.com> | 2010-09-10 11:18:14 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-09-10 09:38:29 -0700 |
| commit | 909a5494f869371565ed9326e984adeabf42611d (patch) | |
| tree | b5ac8af083e68f63af77130aabf68ff0f747b48c /Documentation/git-merge-one-file.txt | |
| parent | t/t4018: test whether the word_regex patterns compile (diff) | |
| download | tgif-909a5494f869371565ed9326e984adeabf42611d.tar.xz | |
userdiff.c: add builtin fortran regex patterns
This adds fortran xfuncname and wordRegex patterns to the list of builtin
patterns. The intention is for the patterns to be appropriate for all
versions of fortran including 77, 90, 95. The patterns can be enabled by
adding the diff=fortran attribute to the .gitattributes file for the
desired file glob.
This also adds a new macro named IPATTERN which is just like the PATTERNS
macro except it sets the REG_ICASE flag so that case will be ignored.
The test code in t4018 and the docs were updated as appropriate.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions