summaryrefslogtreecommitdiffstats
path: root/userdiff.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs/diff-exit-code-with-external-diff'Junio C Hamano2024-06-211-2/+6
|\
| * diff: let external diffs report that changes are uninterestingRené Scharfe2024-06-101-0/+4
| * userdiff: add and use struct external_diffRené Scharfe2024-06-101-2/+2
* | global: convert intentionally-leaking config strings to constsPatrick Steinhardt2024-06-071-5/+5
|/
* userdiff: better method/property matching for C#Steven Jeuris2024-04-061-6/+42
* Merge branch 'jk/textconv-cache-outside-repo-fix'Junio C Hamano2024-03-051-1/+3
|\
| * userdiff: skip textconv caching when not in a repositoryJeff King2024-02-261-1/+3
* | use xstrncmpz()René Scharfe2024-02-121-2/+1
|/
* git-compat-util: move alloc macros to git-compat-util.hCalvin Wan2023-07-051-1/+0
* attr: teach "--attr-source=<tree>" global option to "git"John Cai2023-05-061-1/+1
* Merge branch 'rs/userdiff-multibyte-regex'Junio C Hamano2023-04-201-2/+29
|\
| * userdiff: support regexec(3) with multi-byte supportRené Scharfe2023-04-071-2/+29
* | Merge branch 'en/header-cleanup'Junio C Hamano2023-03-171-1/+3
|\ \
| * | alloc.h: move ALLOC_GROW() functions from cache.hElijah Newren2023-02-241-1/+3
* | | Merge branch 'jc/diff-algo-attribute'Junio C Hamano2023-02-271-1/+3
|\ \ \ | |/ / |/| |
| * | diff: teach diff to read algorithm from diff driverJohn Cai2023-02-211-1/+3
* | | userdiff: support Java sealed classesAndrei Rybak2023-02-081-1/+1
* | | userdiff: support Java record typesAndrei Rybak2023-02-081-2/+2
* | | userdiff: support Java type parametersAndrei Rybak2023-02-081-1/+1
* | | attr: add flag `--source` to work with tree-ishKarthik Nayak2023-01-141-1/+1
| |/ |/|
* | userdiff: mark unused parameter in internal callbackJeff King2022-12-131-1/+2
|/
* Merge branch 'jd/userdiff-kotlin'Junio C Hamano2022-03-231-0/+12
|\
| * userdiff: add builtin diff driver for kotlin language.Jaydeep P Das2022-03-131-0/+12
* | userdiff.c: use designated initializers for "struct userdiff_driver"Ævar Arnfjörð Bjarmason2022-02-251-14/+22
|/
* userdiff-cpp: back out the digit-separators in numbersJohannes Sixt2021-10-251-3/+3
* userdiff-cpp: learn the C++ spaceship operatorJohannes Sixt2021-10-111-1/+1
* userdiff-cpp: permit the digit-separating single-quote in numbersJohannes Sixt2021-10-111-3/+3
* userdiff-cpp: tighten word regexJohannes Sixt2021-10-081-1/+7
* Merge branch 'uk/userdiff-php-enum'Junio C Hamano2021-09-101-1/+1
|\
| * userdiff: support enum keyword in PHP hunk headerUSAMI Kenta2021-08-311-1/+1
* | Merge branch 'th/userdiff-more-java'Junio C Hamano2021-08-311-1/+5
|\ \
| * | userdiff: improve java hunk header regexTassilo Horn2021-08-111-1/+5
| |/
* | Merge branch 'jc/userdiff-pattern-hint'Junio C Hamano2021-08-311-0/+10
|\ \ | |/ |/|
| * userdiff: comment on the builtin patternsJunio C Hamano2021-08-111-0/+10
* | userdiff: add support for C# record typesJulian Verdurmen2021-06-161-1/+1
|/
* Merge branch 'ab/userdiff-tests'Junio C Hamano2021-04-211-57/+112
|\
| * userdiff: add and use for_each_userdiff_driver()Ævar Arnfjörð Bjarmason2021-04-081-12/+58
| * userdiff style: normalize pascal regex declarationÆvar Arnfjörð Bjarmason2021-04-081-3/+2
| * userdiff style: declare patterns with consistent styleÆvar Arnfjörð Bjarmason2021-04-081-5/+15
| * userdiff style: re-order drivers in alphabetical orderÆvar Arnfjörð Bjarmason2021-04-081-38/+38
* | userdiff: add support for SchemeAtharva Raykar2021-04-081-0/+9
|/
* Merge branch 've/userdiff-bash'Junio C Hamano2020-11-021-0/+21
|\
| * userdiff: support BashVictor Engmark2020-10-221-0/+21
* | Merge branch 'sd/userdiff-css-update'Junio C Hamano2020-10-271-1/+1
|\ \
| * | userdiff: expand detected chunk headers for cssSohom Datta2020-10-081-1/+1
| |/
* | Merge branch 'kb/userdiff-rust-macro-rules'Junio C Hamano2020-10-271-1/+1
|\ \
| * | userdiff: recognize 'macro_rules!' as starting a Rust function blockKonrad Borowski2020-10-071-1/+1
| |/
* / userdiff: PHP: catch "abstract" and "final" functionsJavier Spagnoletti2020-10-071-1/+1
|/
* userdiff: improve Fortran xfuncname regexPhilippe Blain2020-08-131-1/+1
* userdiff: add tests for Fortran xfuncname regexPhilippe Blain2020-08-131-0/+4