summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)Author
2022-05-20Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano
2022-04-01xdiff/xmacros.h: remove unused XDL_PTRFREEÆvar Arnfjörð Bjarmason
2022-02-16xdiff: handle allocation failure when mergingPhillip Wood
2022-02-16xdiff: refactor a functionPhillip Wood
2022-02-16xdiff: handle allocation failure in patience diffPhillip Wood
2022-02-16xdiff: fix a memory leakPhillip Wood
2021-12-21Merge branch 'pw/xdiff-classify-record-in-histogram'Junio C Hamano
2021-12-05xdiff: drop unused flags parameter from recs_matchJeff King
2021-12-05xdiff: drop xpparam_t parameter from histogram cmp_recs()Jeff King
2021-12-05xdiff: drop CMP_ENV macro from xhistogramJeff King
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood
2021-11-19xdiff: simplify comparisonPhillip Wood
2021-11-19xdiff: avoid unnecessary memory allocationsPhillip Wood
2021-11-19diff histogram: intern stringsPhillip Wood
2021-07-13Merge branch 'ab/pickaxe-pcre2'Junio C Hamano
2021-07-08Merge branch 'ab/xdiff-bug-cleanup'Junio C Hamano
2021-06-08xdiff: use BUG(...), not xdl_bug(...)Ævar Arnfjörð Bjarmason
2021-05-13Merge branch 'pw/patience-diff-clean-up'Junio C Hamano
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason
2021-05-05patience diff: remove unused variablePhillip Wood
2021-05-05patience diff: remove unnecessary string comparisonsPhillip Wood
2020-10-20diff: add -I<regex> that ignores matching changesMichał Kępień
2020-10-20merge-base, xdiff: zero out xpparam_t structuresMichał Kępień
2019-12-16Merge branch 'rs/xdiff-ignore-ws-w-func-context'Junio C Hamano
2019-12-05xdiff: unignore changes in function contextRené Scharfe
2019-10-09xdiffi: fix typos and touch up commentsJohannes Schindelin
2019-07-31Merge branch 'cb/xdiff-no-system-includes-in-dot-c'Junio C Hamano
2019-07-29Merge branch 'jk/xdiff-clamp-funcname-context-index'Junio C Hamano
2019-07-29xdiff: remove duplicate headers from xpatience.cCarlo Marcelo Arenas Belón
2019-07-29xdiff: remove duplicate headers from xhistogram.cCarlo Marcelo Arenas Belón
2019-07-29xdiff: drop system includes in xutils.cCarlo Marcelo Arenas Belón
2019-07-23xdiff: clamp function context indices in post-imageJeff King
2019-04-12xdiff: use xmalloc/xreallocJeff King
2019-04-12xdiff: use git-compat-utilJeff King
2018-11-02xdiff: provide a separate emit callback for hunksJeff King
2018-08-17Merge branch 'sb/indent-heuristic-optim'Junio C Hamano
2018-08-15Merge branch 'sb/histogram-less-memory'Junio C Hamano
2018-08-01xdiff: reduce indent heuristic overheadStefan Beller
2018-07-23xdiff/histogram: remove tail recursionStefan Beller
2018-07-19xdiff/xhistogram: move index allocation into find_lcsStefan Beller
2018-07-19xdiff/xhistogram: factor out memory cleanup into free_index()Stefan Beller
2018-07-19xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diffStefan Beller
2018-07-17xdiff/xdiffi.c: remove unneeded function declarationsStefan Beller
2018-07-17xdiff/xdiff.h: remove unused flagsStefan Beller
2017-12-19Merge branch 'jt/diff-anchored-patience'Junio C Hamano
2017-11-28Merge branch 'rs/include-comments-before-the-function-header'Junio C Hamano
2017-11-28diff: support anchoring line(s)Jonathan Tan
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano