path: root/xdiff
AgeCommit message (Expand)Author
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-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
2016-08-23is_blank_line(): take a single xrecord_t as argumentMichael Haggerty
2016-08-23xdl_change_compact(): only use heuristic if group can't be matchedMichael Haggerty
2016-08-23xdl_change_compact(): fix compaction heuristic to adjust ixoMichael Haggerty
2016-08-08Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano
2016-07-11diff: fix a double off-by-one with --ignore-space-at-eolJohannes Schindelin
2016-06-27Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano
2016-06-20Merge branch 'rs/xdiff-hunk-with-func-line'Junio C Hamano
2016-06-09xdiff: fix merging of appended hunk with -WRené Scharfe
2016-05-31xdiff: -W: don't include common trailing empty lines in contextRené Scharfe
2016-05-31xdiff: ignore empty lines before added functions with -WRené Scharfe
2016-05-31xdiff: handle appended chunks better with -WRené Scharfe
2016-05-31xdiff: factor out match_func_rec()René Scharfe
2016-05-06Merge branch 'jk/diff-compact-heuristic'Junio C Hamano
2016-04-19xdiff: implement empty line chunk heuristicStefan Beller
2016-04-18xdiff: add recs_match helper functionJacob Keller
2016-04-03Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'Junio C Hamano
2016-03-04xdiff/xprepare: fix a memory leakRamsay Jones
2016-03-04xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsRamsay Jones
2016-02-26Merge branch 'ps/plug-xdl-merge-leak'Junio C Hamano
2016-02-26Merge branch 'jk/no-diff-emit-common'Junio C Hamano
2016-02-23xdiff/xmerge: fix memory leak in xdl_mergePatrick Steinhardt
2016-02-23xdiff: drop XDL_EMIT_COMMONJeff King
2016-01-27merge-file: ensure that conflict sections match eol styleJohannes Schindelin
2016-01-27merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin
2014-06-30git-merge-file: do not add LF at EOF while applying unrelated changeMax Kirillov
2013-10-16C: have space around && and || operatorsJunio C Hamano
2013-06-19diff: add --ignore-blank-lines optionAntoine Pelisse
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini
2012-05-25Merge branch 'rs/xdiff-fast-hash-fix'Junio C Hamano
2012-05-23xdiff: import new 32-bit version of count_masked_bytes()René Scharfe
2012-05-23xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe
2012-05-22xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe
2012-05-09xdiff: remove unused functionsRené Scharfe
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe
2012-05-09xdiff: add hunk_func()René Scharfe
2012-05-02Merge branch 'tr/xdiff-fast-hash'Junio C Hamano
2012-05-01xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZEThomas Rast