path: root/Documentation/gitattributes.txt
diff options
authorJunio C Hamano <>2008-09-19 03:32:50 (GMT)
committerJunio C Hamano <>2008-09-19 03:32:50 (GMT)
commitdde4af4313c6fba5269df384d97ef4fa3ab5971d (patch)
tree0441889cf594719be3e4e6f6b7e2234171218fb6 /Documentation/gitattributes.txt
parentaf9ce1ffc6de9774e90a91f27fb1febd027f74f1 (diff)
parent45d9414fa5599b41578625961b53e18a9b9148c7 (diff)
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
* bc/maint-diff-hunk-header-fix: diff.*.xfuncname which uses "extended" regex's for hunk header selection diff.c: associate a flag with each pattern and use it for compiling regex diff.c: return pattern entry pointer rather than just the hunk header pattern Cosmetical command name fix Start conforming code to "git subcmd" style part 3 t9700/ remove File::Temp requirement t9700/ avoid bareword 'STDERR' in 3-argument open() GIT Fix some manual typos. Use compatibility regex library also on FreeBSD Use compatibility regex library also on AIX Update draft release notes for Use compatibility regex library for OSX/Darwin git-svn: Fixes my() parameter list syntax error in pre-5.8 Perl Use File::Temp->tempfile instead of ->new t7501: always use test_cmp instead of diff Start conforming code to "git subcmd" style part 2 diff: Help "less" hide ^M from the output checkout: do not check out unmerged higher stages randomly Conflicts: Documentation/git.txt Documentation/gitattributes.txt Makefile diff.c t/
Diffstat (limited to 'Documentation/gitattributes.txt')
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 75124d2..9a75257 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -288,13 +288,13 @@ for paths.
*.tex diff=tex
-Then, you would define "diff.tex.funcname" configuration to
+Then, you would define "diff.tex.xfuncname" configuration to
specify a regular expression that matches a line that you would
want to appear as the hunk header, like this:
[diff "tex"]
- funcname = "^\\(\\\\\\(sub\\)*section{.*\\)$"
+ xfuncname = "^(\\\\(sub)*section\\{.*)$"
Note. A single level of backslashes are eaten by the
@@ -313,7 +313,7 @@ patterns are available:
- `html` suitable for HTML/XHTML documents.
-- `java` suitable for source code in the Java lanugage.
+- `java` suitable for source code in the Java language.
- `pascal` suitable for source code in the Pascal/Delphi language.