summary refs log tree commit diff
path: root/xdiff
AgeCommit message (Expand)AuthorFilesLines
2022-02-16xdiff: handle allocation failure when mergingPhillip Wood1-1/+6
2022-02-16xdiff: refactor a functionPhillip Wood1-19/+16
2022-02-16xdiff: handle allocation failure in patience diffPhillip Wood1-5/+12
2022-02-16xdiff: fix a memory leakPhillip Wood3-23/+17
2021-12-21Merge branch 'pw/xdiff-classify-record-in-histogram'Junio C Hamano3-42/+29
2021-12-04xdiff: drop unused flags parameter from recs_matchJeff King1-9/+9
2021-12-04xdiff: drop xpparam_t parameter from histogram cmp_recs()Jeff King1-3/+2
2021-12-04xdiff: drop CMP_ENV macro from xhistogramJeff King1-3/+0
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood2-6/+58
2021-11-18xdiff: simplify comparisonPhillip Wood1-4/+1
2021-11-18xdiff: avoid unnecessary memory allocationsPhillip Wood1-4/+7
2021-11-18diff histogram: intern stringsPhillip Wood2-19/+10
2021-07-13Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2-1/+3
2021-07-08Merge branch 'ab/xdiff-bug-cleanup'Junio C Hamano1-14/+8
2021-06-08xdiff: use BUG(...), not xdl_bug(...)Ævar Arnfjörð Bjarmason1-14/+8
2021-05-14Merge branch 'pw/patience-diff-clean-up'Junio C Hamano1-11/+3
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason2-1/+3
2021-05-05patience diff: remove unused variablePhillip Wood1-3/+0
2021-05-05patience diff: remove unnecessary string comparisonsPhillip Wood1-8/+3
2020-10-20diff: add -I<regex> that ignores matching changesMichał Kępień2-2/+49
2020-10-20merge-base, xdiff: zero out xpparam_t structuresMichał Kępień2-0/+4
2019-12-16Merge branch 'rs/xdiff-ignore-ws-w-func-context'Junio C Hamano1-0/+17
2019-12-05xdiff: unignore changes in function contextRené Scharfe1-0/+17
2019-10-09xdiffi: fix typos and touch up commentsJohannes Schindelin1-44/+55
2019-07-31Merge branch 'cb/xdiff-no-system-includes-in-dot-c'Junio C Hamano3-8/+0
2019-07-29Merge branch 'jk/xdiff-clamp-funcname-context-index'Junio C Hamano1-2/+2
2019-07-28xdiff: remove duplicate headers from xpatience.cCarlo Marcelo Arenas Belón1-2/+0
2019-07-28xdiff: remove duplicate headers from xhistogram.cCarlo Marcelo Arenas Belón1-2/+0
2019-07-28xdiff: drop system includes in xutils.cCarlo Marcelo Arenas Belón1-4/+0
2019-07-23xdiff: clamp function context indices in post-imageJeff King1-2/+2
2019-04-12xdiff: use xmalloc/xreallocJeff King1-2/+2
2019-04-12xdiff: use git-compat-utilJeff King1-7/+1
2018-11-02xdiff: provide a separate emit callback for hunksJeff King2-5/+22
2018-08-17Merge branch 'sb/indent-heuristic-optim'Junio C Hamano1-1/+11
2018-08-15Merge branch 'sb/histogram-less-memory'Junio C Hamano1-55/+78
2018-08-01xdiff: reduce indent heuristic overheadStefan Beller1-1/+11
2018-07-23xdiff/histogram: remove tail recursionStefan Beller1-6/+14
2018-07-19xdiff/xhistogram: move index allocation into find_lcsStefan Beller1-43/+53
2018-07-19xdiff/xhistogram: factor out memory cleanup into free_index()Stefan Beller1-4/+9
2018-07-19xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diffStefan Beller1-11/+11
2018-07-17xdiff/xdiffi.c: remove unneeded function declarationsStefan Beller1-17/+0
2018-07-17xdiff/xdiff.h: remove unused flagsStefan Beller1-8/+0
2017-12-19Merge branch 'jt/diff-anchored-patience'Junio C Hamano2-5/+41
2017-11-28Merge branch 'rs/include-comments-before-the-function-header'Junio C Hamano1-3/+10
2017-11-28diff: support anchoring line(s)Jonathan Tan2-5/+41
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2-12/+52
2017-11-21xdiff: show non-empty lines before functions with -WRené Scharfe1-0/+3
2017-11-21xdiff: factor out is_func_rec()René Scharfe1-3/+7
2017-11-09Replace Free Software Foundation address in license noticesTodd Zullinger14-28/+28
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano2-3/+39