summaryrefslogtreecommitdiffstats
path: root/xdiff
AgeCommit message (Expand)AuthorLines
2019-07-31Merge branch 'cb/xdiff-no-system-includes-in-dot-c'Junio C Hamano-8/+0
2019-07-29Merge branch 'jk/xdiff-clamp-funcname-context-index'Junio C Hamano-2/+2
2019-07-28xdiff: remove duplicate headers from xpatience.cCarlo Marcelo Arenas Belón-2/+0
2019-07-28xdiff: remove duplicate headers from xhistogram.cCarlo Marcelo Arenas Belón-2/+0
2019-07-28xdiff: drop system includes in xutils.cCarlo Marcelo Arenas Belón-4/+0
2019-07-23xdiff: clamp function context indices in post-imageJeff King-2/+2
2019-04-12xdiff: use xmalloc/xreallocJeff King-2/+2
2019-04-12xdiff: use git-compat-utilJeff King-7/+1
2018-11-02xdiff: provide a separate emit callback for hunksJeff King-5/+22
2018-08-17Merge branch 'sb/indent-heuristic-optim'Junio C Hamano-1/+11
2018-08-15Merge branch 'sb/histogram-less-memory'Junio C Hamano-55/+78
2018-08-01xdiff: reduce indent heuristic overheadStefan Beller-1/+11
2018-07-23xdiff/histogram: remove tail recursionStefan Beller-6/+14
2018-07-19xdiff/xhistogram: move index allocation into find_lcsStefan Beller-43/+53
2018-07-19xdiff/xhistogram: factor out memory cleanup into free_index()Stefan Beller-4/+9
2018-07-19xdiff/xhistogram: pass arguments directly to fall_back_to_classic_diffStefan Beller-11/+11
2018-07-17xdiff/xdiffi.c: remove unneeded function declarationsStefan Beller-17/+0
2018-07-17xdiff/xdiff.h: remove unused flagsStefan Beller-8/+0
2017-12-19Merge branch 'jt/diff-anchored-patience'Junio C Hamano-5/+41
2017-11-28Merge branch 'rs/include-comments-before-the-function-header'Junio C Hamano-3/+10
2017-11-28diff: support anchoring line(s)Jonathan Tan-5/+41
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano-12/+52
2017-11-21xdiff: show non-empty lines before functions with -WRené Scharfe-0/+3
2017-11-21xdiff: factor out is_func_rec()René Scharfe-3/+7
2017-11-09Replace Free Software Foundation address in license noticesTodd Zullinger-28/+28
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano-3/+39
2017-10-27xdiff: reassign xpparm_t.flags bitsJunio C Hamano-10/+14
2017-10-10cleanup: fix possible overflow errors in binary searchDerrick Stolee-1/+1
2017-01-15xdiff -W: relax end-of-file function detectionVegard Nossum-8/+6
2017-01-10Merge branch 'jc/retire-compaction-heuristics'Junio C Hamano-35/+1
2016-12-23diff: retire "compaction" heuristicsJunio C Hamano-35/+1
2016-12-06xdiff: drop XDL_FAST_HASHJeff King-106/+0
2016-10-03Merge branch 'mh/diff-indent-heuristic'Junio C Hamano-7/+7
2016-09-29Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano-1/+1
2016-09-27xdiff: rename "struct group" to "struct xdlgroup"Jeff King-7/+7
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano-98/+538
2016-09-21Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'Junio C Hamano-1/+1
2016-09-19diff: improve positioning of add/delete blocks in diffsMichael Haggerty-0/+326
2016-09-14xdiff: fix merging of hunks with -W context and -u contextRené Scharfe-1/+1
2016-09-07xdiff: remove unneeded declarationsStefan Beller-9/+0
2016-08-23xdl_change_compact(): introduce the concept of a change groupMichael Haggerty-90/+203
2016-08-23recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty-7/+7
2016-08-23is_blank_line(): take a single xrecord_t as argumentMichael Haggerty-4/+4
2016-08-23xdl_change_compact(): only use heuristic if group can't be matchedMichael Haggerty-19/+19
2016-08-23xdl_change_compact(): fix compaction heuristic to adjust ixoMichael Haggerty-0/+1
2016-08-08Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano-3/+5
2016-07-11diff: fix a double off-by-one with --ignore-space-at-eolJohannes Schindelin-3/+5
2016-06-27Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano-8/+57
2016-06-20Merge branch 'rs/xdiff-hunk-with-func-line'Junio C Hamano-8/+57
2016-06-09xdiff: fix merging of appended hunk with -WRené Scharfe-1/+2