summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-09-29 17:23:19 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-09-29 17:23:19 (GMT)
commitedb7e82f72106add9f2fbaf9d99d9532a72e3f91 (patch)
treea4622ea3d53d1414acd3a20eb0098140ff864cd6 /Documentation/gitattributes.txt
parente9a06f1eeb6ddd952ece71eaa87e613d715eade6 (diff)
parente3bf5e43fd9db9391ebc876ef118dbb431853d69 (diff)
downloadgit-edb7e82f72106add9f2fbaf9d99d9532a72e3f91.zip
git-edb7e82f72106add9f2fbaf9d99d9532a72e3f91.tar.gz
git-edb7e82f72106add9f2fbaf9d99d9532a72e3f91.tar.bz2
Merge branch 'bc/maint-diff-hunk-header-fix' into maint
* bc/maint-diff-hunk-header-fix: t4018-diff-funcname: test syntax of builtin xfuncname patterns diff hunk pattern: fix misconverted "\{" tex macro introducers diff: use extended regexp to find hunk headers 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 Conflicts: Documentation/gitattributes.txt
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 8962768..53da9b4 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -288,13 +288,13 @@ for paths.
*.tex diff=tex
------------------------
-Then, you would define a "diff.tex.funcname" configuration to
+Then, you would define a "diff.tex.xfuncname" configuration to
specify a regular expression that matches a line that you would
want to appear as the hunk header "TEXT", like this:
------------------------
[diff "tex"]
- funcname = "^\\(\\\\\\(sub\\)*section{.*\\)$"
+ xfuncname = "^(\\\\(sub)*section\\{.*)$"
------------------------
Note. A single level of backslashes are eaten by the