summaryrefslogtreecommitdiff
path: root/userdiff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ah/userdiff-markdown'Junio C Hamano2020-05-081-0/+3
|\
| * userdiff: support MarkdownAsh Holland2020-05-021-0/+3
* | parse_config_key(): return subsection len as size_tJeff King2020-04-101-2/+2
|/
* Merge branch 'ln/userdiff-elixir'Junio C Hamano2019-12-251-1/+2
|\
| * userdiff: remove empty subexpression from elixir regexEd Maste2019-12-131-1/+2
* | Merge branch 'jh/userdiff-python-async'Junio C Hamano2019-12-051-1/+1
|\ \ | |/ |/|
| * userdiff: support Python async functionsJosh Holland2019-11-201-1/+1
* | userdiff: add Elixir to supported userdiff languagesŁukasz Niemier2019-11-101-0/+12
* | userdiff: fix some corner cases in dts regexStephen Boyd2019-10-211-1/+2
* | userdiff: add a builtin pattern for dts filesStephen Boyd2019-08-211-0/+8
|/
* Merge branch 'ml/userdiff-rust'Junio C Hamano2019-06-211-0/+6
|\
| * userdiff: two simplifications of patterns for rustJohannes Sixt2019-05-301-3/+2
| * userdiff: add built-in pattern for rustMarc-André Lureau2019-05-171-0/+7
* | userdiff: fix grammar and style issuesBoxuan Li2019-05-291-2/+4
* | userdiff: add OctaveBoxuan Li2019-05-191-1/+4
|/
* Merge branch 'nd/style-opening-brace'Junio C Hamano2019-01-181-1/+2
|\
| * style: the opening '{' of a function is in a separate lineNguyễn Thái Ngọc Duy2018-12-101-1/+2
* | notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-2/+3
|/
* Merge branch 'nd/the-index'Junio C Hamano2018-10-191-2/+3
|\
| * userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+3
* | Make git_check_attr() a void functionTorsten Bögershausen2018-09-121-2/+1
|/
* attr: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-08-131-1/+1
* userdiff: support new keywords in PHP hunk headerKana Natsuno2018-07-061-1/+1
* Merge branch 'tl/userdiff-csharp-async'Junio C Hamano2018-03-151-1/+1
|\
| * userdiff.c: add C# async keyword in diff patterntl/userdiff-csharp-asyncThomas Levesque2018-03-081-1/+1
* | userdiff: add built-in pattern for golangag/userdiff-go-funcnameAlban Gruin2018-03-011-0/+9
|/
* Merge branch 'ik/userdiff-html-h-element-fix'Junio C Hamano2017-09-281-1/+1
|\
| * userdiff: fix HTML hunk header regexpik/userdiff-html-h-element-fixIlya Kantor2017-09-241-1/+1
* | userdiff: release strbuf after use in userdiff_get_textconv()Rene Scharfe2017-09-071-0/+1
* | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | attr: convert git_check_attrs() callers to use the new APIJunio C Hamano2017-02-011-11/+8
* | attr: rename function and struct related to checking attributesJunio C Hamano2017-02-011-2/+2
|/
* userdiff: add built-in pattern for CSSwd/userdiff-cssWilliam Duclot2016-06-031-0/+12
* userdiff: add support for Fountain documentszb/userdiff-fountainZoë Blade2015-07-231-0/+2
* do not include the same header twicedp/remove-duplicated-header-inclusionДилян Палаузов2015-02-131-1/+0
* userdiff: have 'cpp' hunk header pattern catch more C++ anchor pointsjs/userdiff-ccJohannes Sixt2014-03-211-5/+3
* userdiff: support unsigned and long long suffixes of integer constantsJohannes Sixt2014-03-211-1/+1
* userdiff: support C++ ->* and .* operators in the word regexpJohannes Sixt2014-03-211-1/+1
* userdiff: update Ada patternsaj/ada-diff-word-patternAdrian Johnson2014-02-051-2/+2
* userdiff: drop parse_driver functionJeff King2013-01-231-29/+21
* convert some config callbacks to parse_config_keyJeff King2013-01-231-10/+3
* Add userdiff patterns for AdaAdrian Johnson2012-09-161-0/+9
* drop odd return value semantics from userdiff_configjk/userdiff-config-simplifyJeff King2012-02-071-13/+6
* Merge branch 'tr/userdiff-c-returns-pointer'Junio C Hamano2011-12-131-1/+1
|\
| * userdiff: allow * between cpp funcname wordstr/userdiff-c-returns-pointerThomas Rast2011-12-061-1/+1
* | Add built-in diff patterns for MATLAB codegh/userdiff-matlabGustaf Hendeby2011-11-151-0/+3
* | 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