aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-31 10:41:01 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-31 17:04:56 -0700
commite910ce30e41ae4ddc20a64661e8cf2702433e5db (patch)
tree054a851e0f797358bcbeddec3fe33a3307cd3400 /diff.c
parente1afaea9427d6b367a3e35b5f2cd7fbfb7148dab (diff)
parentd266a988456fcaab9918eae39f5faf8dcb20cb26 (diff)
downloadgit-e910ce30e41ae4ddc20a64661e8cf2702433e5db.tar.gz
git-e910ce30e41ae4ddc20a64661e8cf2702433e5db.tar.xz
Merge branch 'tr/rev-list-docs' into tr/filter-branch
This prepares the necessary parts to merge filter-branch fix based on simplify-merges to master.
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 6954f992c..bf5d5f15a 100644
--- a/diff.c
+++ b/diff.c
@@ -1387,6 +1387,7 @@ static struct builtin_funcname_pattern {
"\\|"
"^\\(.*=[ \t]*\\(class\\|record\\).*\\)$"
},
+ { "bibtex", "\\(@[a-zA-Z]\\{1,\\}[ \t]*{\\{0,1\\}[ \t]*[^ \t\"@',\\#}{~%]*\\).*$" },
{ "tex", "^\\(\\\\\\(\\(sub\\)*section\\|chapter\\|part\\)\\*\\{0,1\\}{.*\\)$" },
{ "ruby", "^\\s*\\(\\(class\\|module\\|def\\)\\s.*\\)$" },
};