summaryrefslogtreecommitdiff
path: root/userdiff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/userdiff-c-returns-pointer' into maintJunio C Hamano2011-12-211-1/+1
|\
| * userdiff: allow * between cpp funcname wordstr/userdiff-c-returns-pointerThomas Rast2011-12-061-1/+1
* | Rename git_checkattr() to git_check_attr()Michael Haggerty2011-08-041-1/+1
* | Merge branch 'jk/combine-diff-binary-etc'Junio C Hamano2011-06-291-0/+17
|\ \
| * | refactor get_textconv to not require diff_filespecJeff King2011-05-231-0/+17
* | | userdiff/perl: tighten BEGIN/END block pattern to reject here-doc delimitersJonathan Nieder2011-05-231-1/+1
* | | userdiff/perl: catch sub with brace on second lineJonathan Nieder2011-05-211-3/+17
* | | userdiff/perl: match full line of POD headersJonathan Nieder2011-05-211-1/+1
* | | userdiff/perl: anchor "sub" and "package" patterns on the leftJonathan Nieder2011-05-211-2/+2
|/ /
* | Merge branch 'tr/diff-words-test'Junio C Hamano2011-02-091-24/+16
|\ \
| * | userdiff: simplify word-diff safeguardJonathan Nieder2011-01-181-24/+16
* | | Merge branch 'as/userdiff-pascal'Junio C Hamano2011-01-241-1/+1
|\ \ \ | |/ / |/| |
| * | userdiff: match Pascal class methodsAlexey Shumkin2011-01-111-1/+1
* | | userdiff/perl: catch BEGIN/END/... and POD as headersJunio C Hamano2010-12-271-1/+3
* | | diff: funcname and word patterns for perlJonathan Nieder2010-12-271-0/+15
|/ /
* | userdiff: fix typo in ruby and python word regexesThomas Rast2010-12-181-2/+2
* | userdiff.c: add builtin fortran regex patternsBrandon Casey2010-09-101-0/+17
|/
* Userdiff patterns for C#Petr Onderka2010-08-161-0/+16
* Merge branch 'bs/userdiff-php'Junio C Hamano2010-06-131-1/+3
|\
| * diff: Support visibility modifiers in the PHP hunk header regexpBjörn Steinbrink2010-05-271-1/+3
* | diff: cache textconv outputJeff King2010-04-021-0/+9
|/
* git_attr(): fix function signatureJunio C Hamano2010-01-161-1/+1
* avoid exponential regex match for java and objc function namesPaolo Bonzini2009-06-181-2/+3
* Change the spelling of "wordregex".Boyd Stephen Smith Jr2009-01-211-2/+2
* color-words: make regex configurable via attributesThomas Rast2009-01-171-15/+63
* userdiff: require explicitly allowing textconvJeff King2008-10-261-9/+1
* diff: add filter for converting binary to textJeff King2008-10-181-0/+2
* diff: introduce diff.<driver>.binaryJeff King2008-10-181-3/+16
* diff: unify external diff and funcname parsing codeJeff King2008-10-181-0/+160
View Lorry Controller Status