diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-31 10:41:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 17:04:56 -0700 |
| commit | e910ce30e41ae4ddc20a64661e8cf2702433e5db (patch) | |
| tree | 054a851e0f797358bcbeddec3fe33a3307cd3400 /diff.c | |
| parent | Merge branch 'jc/post-simplify' (early part) into tr/filter-branch (diff) | |
| parent | Documentation: rev-list-options: move --simplify-merges documentation (diff) | |
| download | git-e910ce30e41ae4ddc20a64661e8cf2702433e5db.tar.gz git-e910ce30e41ae4ddc20a64661e8cf2702433e5db.zip | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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.*\\)$" }, }; |