aboutsummaryrefslogtreecommitdiff
path: root/xdiff
Commit message (Expand)AuthorAge
* Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-10-03
|\
| * xdiff: rename "struct group" to "struct xdlgroup"Jeff King2016-09-27
* | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-26
|\ \ | |/
| * diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-19
| * xdl_change_compact(): introduce the concept of a change groupMichael Haggerty2016-08-23
| * recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty2016-08-23
| * is_blank_line(): take a single xrecord_t as argumentMichael Haggerty2016-08-23
| * xdl_change_compact(): only use heuristic if group can't be matchedMichael Haggerty2016-08-23
| * xdl_change_compact(): fix compaction heuristic to adjust ixoMichael Haggerty2016-08-23
| * Merge branch 'rs/xdiff-hunk-with-func-line'Junio C Hamano2016-06-20
| |\
* | \ Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'Junio C Hamano2016-09-21
|\ \ \
| * | | xdiff: fix merging of hunks with -W context and -u contextRené Scharfe2016-09-14
* | | | xdiff: remove unneeded declarationsStefan Beller2016-09-07
|/ / /
* | | Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-08
|\ \ \
| * | | diff: fix a double off-by-one with --ignore-space-at-eolJohannes Schindelin2016-07-11
* | | | Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano2016-06-27
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | xdiff: fix merging of appended hunk with -WRené Scharfe2016-06-09
| * | xdiff: -W: don't include common trailing empty lines in contextRené Scharfe2016-05-31
| * | xdiff: ignore empty lines before added functions with -WRené Scharfe2016-05-31
| * | xdiff: handle appended chunks better with -WRené Scharfe2016-05-31
| * | xdiff: factor out match_func_rec()René Scharfe2016-05-31
* | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-05-06
|\ \ \
| * | | xdiff: implement empty line chunk heuristicStefan Beller2016-04-19
| * | | xdiff: add recs_match helper functionJacob Keller2016-04-18
| | |/ | |/|
* | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'Junio C Hamano2016-04-03
|\ \ \ | |_|/ |/| |
| * | xdiff/xprepare: fix a memory leakRamsay Jones2016-03-04
| * | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsRamsay Jones2016-03-04
| |/
* | Merge branch 'ps/plug-xdl-merge-leak'Junio C Hamano2016-02-26
|\ \
| * | xdiff/xmerge: fix memory leak in xdl_mergePatrick Steinhardt2016-02-23
| |/
* | Merge branch 'jk/no-diff-emit-common'Junio C Hamano2016-02-26
|\ \
| * | xdiff: drop XDL_EMIT_COMMONJeff King2016-02-22
| |/
* | merge-file: ensure that conflict sections match eol styleJohannes Schindelin2016-01-27
* | merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin2016-01-27
|/
* git-merge-file: do not add LF at EOF while applying unrelated changeMax Kirillov2014-06-30
* C: have space around && and || operatorsJunio C Hamano2013-10-16
* diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-19
* Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-12
* Merge branch 'rs/xdiff-fast-hash-fix'Junio C Hamano2012-05-25
|\
| * xdiff: import new 32-bit version of count_masked_bytes()René Scharfe2012-05-23
| * xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe2012-05-23
| * xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe2012-05-22
* | xdiff: remove unused functionsRené Scharfe2012-05-09
* | xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe2012-05-09
* | xdiff: add hunk_func()René Scharfe2012-05-09
* | Merge branch 'tr/xdiff-fast-hash'Junio C Hamano2012-05-02
|\ \ | |/
| * xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZEThomas Rast2012-05-01
| * xdiff: load full words in the inner loop of xdl_hash_recordThomas Rast2012-04-09
* | Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-15
|\ \ | |/ |/|
| * xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano2012-02-19
| * xdiff: remove XDL_PATCH_* macrosJunio C Hamano2012-02-19