summaryrefslogtreecommitdiffstats
path: root/xdiff-interface.c (follow)
Commit message (Expand)AuthorAgeLines
* xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood2021-12-01-0/+2
* Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2021-07-13-11/+16
|\
| * xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason2021-05-11-6/+0
| * xdiff-interface: allow early return from xdiff_emit_line_fnÆvar Arnfjörð Bjarmason2021-05-11-4/+14
| * xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason2021-05-11-1/+2
* | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-27-1/+1
|/
* xdiff: avoid computing non-zero offset from NULL pointerJeff King2020-01-28-2/+6
* avoid computing zero offsets from NULL pointerJeff King2020-01-28-2/+2
* completion: add more parameter value completionNguyễn Thái Ngọc Duy2019-02-20-0/+4
* Merge branch 'jk/xdiff-interface'Junio C Hamano2018-11-13-45/+31
|\
| * xdiff-interface: drop parse_hunk_header()Jeff King2018-11-05-45/+0
| * diff: use hunk callback for word-diffJeff King2018-11-05-0/+3
| * diff: avoid generating unused hunk header linesJeff King2018-11-05-0/+6
| * xdiff-interface: provide a separate consume callback for hunksJeff King2018-11-02-4/+26
| * xdiff: provide a separate emit callback for hunksJeff King2018-11-02-1/+1
* | convert "oidcmp() == 0" to oideq()Jeff King2018-08-29-1/+1
|/
* object-store: move object access functions to object-store.hStefan Beller2018-05-16-0/+1
* sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-14-1/+1
* xdiff-interface: export comparing and hashing stringsStefan Beller2017-10-26-0/+12
* Merge branch 'bw/config-h'Junio C Hamano2017-06-24-0/+1
|\
| * config: don't include config.h by defaultBrandon Williams2017-06-15-0/+1
* | print errno when reporting a system call errorNguyễn Thái Ngọc Duy2017-05-26-2/+2
|/
* Merge branch 'js/regexec-buf'Junio C Hamano2016-09-26-9/+4
|\
| * regex: use regexec_buf()Johannes Schindelin2016-09-21-9/+4
* | Convert read_mmblob to take struct object_id.brian m. carlson2016-09-07-4/+4
* | xdiff: don't trim common tail with -WRené Scharfe2016-05-31-6/+4
|/
* convert trivial cases to ALLOC_ARRAYJeff King2016-02-22-1/+1
* xdiff: reject files larger than ~1GBJeff King2015-09-28-0/+3
* xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe2012-05-09-44/+0
* add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-14-1/+1
* Merge branch 'rs/maint-diff-fd-leak' into maintJunio C Hamano2010-12-26-1/+3
|\
| * close file on error in read_mmfile()René Scharfe2010-12-26-1/+3
* | xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey2010-09-09-3/+2
* | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-04-5/+6
|\ \
| * | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-04-5/+6
| |/
* / refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov2010-02-17-0/+17
|/
* userdiff: add xdiff_clear_find_func()René Scharfe2009-07-01-0/+15
* Remove unused function scope local variablesBenjamin Kramer2009-03-07-2/+1
* xdiff-interface.c: remove 10 duplicated linesJim Meyering2008-11-26-11/+0
* Merge branch 'rs/blame'Junio C Hamano2008-11-08-1/+48
|\
| * add xdi_diff_hunks() for callers that only need hunk lengthsRené Scharfe2008-10-25-1/+48
* | Merge branch 'maint'Junio C Hamano2008-10-17-0/+10
|\ \ | |/ |/|
| * xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey2008-10-16-1/+11
* | xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey2008-10-02-1/+11
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-29-9/+12
|\ \
| * | diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano2008-09-20-7/+10
| * | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-18-2/+2
| |\|
| | * diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-18-2/+2
* | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29-0/+20
|\ \ \ | |/ / |/| |
| * | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-30-0/+20
| |/
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 16:58:50 +0000