summaryrefslogtreecommitdiff
path: root/xdiff
Commit message (Expand)AuthorAgeFilesLines
* xdiff: mark unused parameter in xdl_call_hunk_func()Jeff King2022-12-131-1/+1
* xdiff: drop unused parameter in def_ff()Jeff King2022-12-131-2/+2
* xdiff: drop unused mmfile parameters from xdl_do_patience_diff()Jeff King2022-08-203-19/+9
* xdiff: drop unused mmfile parameters from xdl_do_histogram_diff()Jeff King2022-08-193-5/+3
* xdiff: introduce XDL_ALLOC_GROW()Phillip Wood2022-07-084-16/+33
* xdiff: introduce XDL_CALLOC_ARRAY()Phillip Wood2022-07-084-14/+11
* xdiff: introduce xdl_callocPhillip Wood2022-07-084-24/+15
* xdiff: introduce XDL_ALLOC_ARRAY()Phillip Wood2022-07-084-7/+12
* Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano2022-05-203-3/+3
|\
| * Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano2022-05-023-3/+3
| |\
| | * tree-wide: apply equals-null.cocciJunio C Hamano2022-05-023-3/+3
* | | xdiff/xmacros.h: remove unused XDL_PTRFREEÆvar Arnfjörð Bjarmason2022-04-011-1/+0
* | | xdiff: handle allocation failure when mergingPhillip Wood2022-02-161-1/+6
* | | xdiff: refactor a functionPhillip Wood2022-02-161-19/+16
* | | xdiff: handle allocation failure in patience diffPhillip Wood2022-02-161-5/+12
* | | xdiff: fix a memory leakPhillip Wood2022-02-163-23/+17
|/ /
* | Merge branch 'pw/xdiff-classify-record-in-histogram'Junio C Hamano2021-12-213-42/+29
|\ \
| * | xdiff: drop unused flags parameter from recs_matchJeff King2021-12-041-9/+9
| * | xdiff: drop xpparam_t parameter from histogram cmp_recs()Jeff King2021-12-041-3/+2
| * | xdiff: drop CMP_ENV macro from xhistogramJeff King2021-12-041-3/+0
| * | xdiff: simplify comparisonPhillip Wood2021-11-181-4/+1
| * | xdiff: avoid unnecessary memory allocationsPhillip Wood2021-11-181-4/+7
| * | diff histogram: intern stringsPhillip Wood2021-11-182-19/+10
| |/
* | xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood2021-12-012-6/+58
|/
* Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2021-07-132-1/+3
|\
| * xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason2021-05-112-1/+3
* | Merge branch 'ab/xdiff-bug-cleanup'Junio C Hamano2021-07-081-14/+8
|\ \
| * | xdiff: use BUG(...), not xdl_bug(...)Ævar Arnfjörð Bjarmason2021-06-081-14/+8
| |/
* | Merge branch 'pw/patience-diff-clean-up'Junio C Hamano2021-05-141-11/+3
|\ \ | |/ |/|
| * patience diff: remove unused variablePhillip Wood2021-05-051-3/+0
| * patience diff: remove unnecessary string comparisonsPhillip Wood2021-05-051-8/+3
* | diff: add -I<regex> that ignores matching changesMichał Kępień2020-10-202-2/+49
* | merge-base, xdiff: zero out xpparam_t structuresMichał Kępień2020-10-202-0/+4
|/
* Merge branch 'rs/xdiff-ignore-ws-w-func-context'Junio C Hamano2019-12-161-0/+17
|\
| * xdiff: unignore changes in function contextRené Scharfe2019-12-051-0/+17
* | xdiffi: fix typos and touch up commentsJohannes Schindelin2019-10-091-44/+55
|/
* Merge branch 'cb/xdiff-no-system-includes-in-dot-c'Junio C Hamano2019-07-313-8/+0
|\
| * xdiff: remove duplicate headers from xpatience.cCarlo Marcelo Arenas Belón2019-07-281-2/+0
| * xdiff: remove duplicate headers from xhistogram.cCarlo Marcelo Arenas Belón2019-07-281-2/+0
| * xdiff: drop system includes in xutils.cCarlo Marcelo Arenas Belón2019-07-281-4/+0
* | Merge branch 'jk/xdiff-clamp-funcname-context-index'Junio C Hamano2019-07-291-2/+2
|\ \ | |/ |/|
| * xdiff: clamp function context indices in post-imageJeff King2019-07-231-2/+2
* | xdiff: use xmalloc/xreallocJeff King2019-04-121-2/+2
* | xdiff: use git-compat-utilJeff King2019-04-121-7/+1
|/
* xdiff: provide a separate emit callback for hunksJeff King2018-11-022-5/+22
* Merge branch 'sb/indent-heuristic-optim'Junio C Hamano2018-08-171-1/+11
|\
| * xdiff: reduce indent heuristic overheadStefan Beller2018-08-011-1/+11
* | Merge branch 'sb/histogram-less-memory'Junio C Hamano2018-08-151-55/+78
|\ \
| * | xdiff/histogram: remove tail recursionStefan Beller2018-07-231-6/+14
| * | xdiff/xhistogram: move index allocation into find_lcsStefan Beller2018-07-191-43/+53
View Lorry Controller Status