summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)AuthorFilesLines
2021-07-13Merge branch 'ab/pickaxe-pcre2'Libravatar Junio C Hamano2-1/+3
2021-07-08Merge branch 'ab/xdiff-bug-cleanup'Libravatar Junio C Hamano1-14/+8
2021-06-08xdiff: use BUG(...), not xdl_bug(...)Libravatar Ævar Arnfjörð Bjarmason1-14/+8
2021-05-14Merge branch 'pw/patience-diff-clean-up'Libravatar Junio C Hamano1-11/+3
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagLibravatar Ævar Arnfjörð Bjarmason2-1/+3
2021-05-05patience diff: remove unused variableLibravatar Phillip Wood1-3/+0
2021-05-05patience diff: remove unnecessary string comparisonsLibravatar Phillip Wood1-8/+3
2020-10-20diff: add -I<regex> that ignores matching changesLibravatar Michał Kępień2-2/+49
2020-10-20merge-base, xdiff: zero out xpparam_t structuresLibravatar Michał Kępień2-0/+4
2019-12-16Merge branch 'rs/xdiff-ignore-ws-w-func-context'Libravatar Junio C Hamano1-0/+17
2019-12-05xdiff: unignore changes in function contextLibravatar René Scharfe1-0/+17
2019-10-09xdiffi: fix typos and touch up commentsLibravatar Johannes Schindelin1-44/+55
2019-07-31Merge branch 'cb/xdiff-no-system-includes-in-dot-c'Libravatar Junio C Hamano3-8/+0
2019-07-29Merge branch 'jk/xdiff-clamp-funcname-context-index'Libravatar Junio C Hamano1-2/+2
2019-07-28xdiff: remove duplicate headers from xpatience.cLibravatar Carlo Marcelo Arenas Belón1-2/+0
2019-07-28xdiff: remove duplicate headers from xhistogram.cLibravatar Carlo Marcelo Arenas Belón1-2/+0
2019-07-28xdiff: drop system includes in xutils.cLibravatar Carlo Marcelo Arenas Belón1-4/+0
2019-07-23xdiff: clamp function context indices in post-imageLibravatar Jeff King1-2/+2
2019-04-12xdiff: use xmalloc/xreallocLibravatar Jeff King1-2/+2
2019-04-12xdiff: use git-compat-utilLibravatar Jeff King1-7/+1
2018-11-02xdiff: provide a separate emit callback for hunksLibravatar Jeff King2-5/+22
2018-08-17Merge branch 'sb/indent-heuristic-optim'Libravatar Junio C Hamano1-1/+11
2018-08-15Merge branch 'sb/histogram-less-memory'Libravatar Junio C Hamano1-55/+78
2018-08-01xdiff: reduce indent heuristic overheadLibravatar Stefan Beller1-1/+11
2018-07-23xdiff/histogram: remove tail recursionLibravatar Stefan Beller1-6/+14
2018-07-19xdiff/xhistogram: move index allocation into find_lcsLibravatar Stefan Beller1-43/+53
2018-07-19xdiff/xhistogram: factor out memory cleanup into free_index()Libravatar Stefan Beller1-4/+9
2018-07-19xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diffLibravatar Stefan Beller1-11/+11
2018-07-17xdiff/xdiffi.c: remove unneeded function declarationsLibravatar Stefan Beller1-17/+0
2018-07-17xdiff/xdiff.h: remove unused flagsLibravatar Stefan Beller1-8/+0
2017-12-19Merge branch 'jt/diff-anchored-patience'Libravatar Junio C Hamano2-5/+41
2017-11-28Merge branch 'rs/include-comments-before-the-function-header'Libravatar Junio C Hamano1-3/+10
2017-11-28diff: support anchoring line(s)Libravatar Jonathan Tan2-5/+41
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Libravatar Junio C Hamano2-12/+52
2017-11-21xdiff: show non-empty lines before functions with -WLibravatar René Scharfe1-0/+3
2017-11-21xdiff: factor out is_func_rec()Libravatar René Scharfe1-3/+7
2017-11-09Replace Free Software Foundation address in license noticesLibravatar Todd Zullinger14-28/+28
2017-11-08diff: --ignore-cr-at-eolLibravatar Junio C Hamano2-3/+39
2017-10-27xdiff: reassign xpparm_t.flags bitsLibravatar Junio C Hamano1-10/+14
2017-10-10cleanup: fix possible overflow errors in binary searchLibravatar Derrick Stolee1-1/+1
2017-01-15xdiff -W: relax end-of-file function detectionLibravatar Vegard Nossum1-8/+6
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Libravatar Junio C Hamano2-35/+1
2016-12-23diff: retire "compaction" heuristicsLibravatar Junio C Hamano2-35/+1
2016-12-06xdiff: drop XDL_FAST_HASHLibravatar Jeff King1-106/+0
2016-10-03Merge branch 'mh/diff-indent-heuristic'Libravatar Junio C Hamano1-7/+7
2016-09-29Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintLibravatar Junio C Hamano1-1/+1
2016-09-27xdiff: rename "struct group" to "struct xdlgroup"Libravatar Jeff King1-7/+7
2016-09-26Merge branch 'mh/diff-indent-heuristic'Libravatar Junio C Hamano2-98/+538
2016-09-21Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'Libravatar Junio C Hamano1-1/+1
2016-09-19diff: improve positioning of add/delete blocks in diffsLibravatar Michael Haggerty2-0/+326