summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)Author
3 daysMerge branch 'pw/patience-diff-clean-up'Junio C Hamano
12 dayspatience diff: remove unused variablePhillip Wood
12 dayspatience 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
2017-11-21xdiff: show non-empty lines before functions with -WRené Scharfe
2017-11-21xdiff: factor out is_func_rec()René Scharfe
2017-11-09Replace Free Software Foundation address in license noticesTodd Zullinger
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano
2017-10-27xdiff: reassign xpparm_t.flags bitsJunio C Hamano
2017-10-09cleanup: fix possible overflow errors in binary searchDerrick Stolee
2017-01-16xdiff -W: relax end-of-file function detectionVegard Nossum
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano
2016-12-23diff: retire "compaction" heuristicsJunio C Hamano
2016-12-06xdiff: drop XDL_FAST_HASHJeff King
2016-10-03Merge branch 'mh/diff-indent-heuristic'Junio C Hamano
2016-09-29Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano
2016-09-27xdiff: rename "struct group" to "struct xdlgroup"Jeff King
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano
2016-09-21Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'Junio C Hamano
2016-09-19diff: improve positioning of add/delete blocks in diffsMichael Haggerty
2016-09-14xdiff: fix merging of hunks with -W context and -u contextRené Scharfe
2016-09-07xdiff: remove unneeded declarationsStefan Beller
2016-08-23xdl_change_compact(): introduce the concept of a change groupMichael Haggerty
2016-08-23recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty