summaryrefslogtreecommitdiff
path: root/xdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-09-262-98/+538
|\
| * diff: improve positioning of add/delete blocks in diffsMichael Haggerty2016-09-192-0/+326
| * xdl_change_compact(): introduce the concept of a change groupMichael Haggerty2016-08-231-90/+203
| * recs_match(): take two xrecord_t pointers as argumentsMichael Haggerty2016-08-231-7/+7
| * is_blank_line(): take a single xrecord_t as argumentMichael Haggerty2016-08-231-4/+4
| * xdl_change_compact(): only use heuristic if group can't be matchedMichael Haggerty2016-08-231-19/+19
| * xdl_change_compact(): fix compaction heuristic to adjust ixoMichael Haggerty2016-08-231-0/+1
| * Merge branch 'rs/xdiff-hunk-with-func-line'Junio C Hamano2016-06-201-8/+57
| |\
* | \ Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'Junio C Hamano2016-09-211-1/+1
|\ \ \
| * | | xdiff: fix merging of hunks with -W context and -u contextrs/xdiff-merge-overlapping-hunks-for-W-contextRené Scharfe2016-09-141-1/+1
* | | | xdiff: remove unneeded declarationssb/xdiff-remove-unused-static-declStefan Beller2016-09-071-9/+0
|/ / /
* | | Merge branch 'js/ignore-space-at-eol' into maintJunio C Hamano2016-08-082-3/+5
|\ \ \
| * | | diff: fix a double off-by-one with --ignore-space-at-eoljs/ignore-space-at-eolJohannes Schindelin2016-07-112-3/+5
* | | | Merge branch 'rs/xdiff-hunk-with-func-line' into maintJunio C Hamano2016-06-271-8/+57
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | xdiff: fix merging of appended hunk with -Wrs/xdiff-hunk-with-func-lineRené Scharfe2016-06-091-1/+2
| * | xdiff: -W: don't include common trailing empty lines in contextRené Scharfe2016-05-311-0/+2
| * | xdiff: ignore empty lines before added functions with -WRené Scharfe2016-05-311-2/+20
| * | xdiff: handle appended chunks better with -WRené Scharfe2016-05-311-3/+24
| * | xdiff: factor out match_func_rec()René Scharfe2016-05-311-4/+11
* | | Merge branch 'jk/diff-compact-heuristic'Junio C Hamano2016-05-062-4/+38
|\ \ \
| * | | xdiff: implement empty line chunk heuristicStefan Beller2016-04-192-0/+28
| * | | xdiff: add recs_match helper functionJacob Keller2016-04-181-4/+10
| | |/ | |/|
* | | Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'Junio C Hamano2016-04-031-1/+2
|\ \ \ | |_|/ |/| |
| * | xdiff/xprepare: fix a memory leakrj/xdiff-prepare-plug-leak-on-error-codepathRamsay Jones2016-03-041-0/+1
| * | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsRamsay Jones2016-03-041-1/+1
| |/
* | Merge branch 'ps/plug-xdl-merge-leak'Junio C Hamano2016-02-261-2/+7
|\ \
| * | xdiff/xmerge: fix memory leak in xdl_mergeps/plug-xdl-merge-leakPatrick Steinhardt2016-02-231-2/+7
| |/
* | Merge branch 'jk/no-diff-emit-common'Junio C Hamano2016-02-262-19/+0
|\ \
| * | xdiff: drop XDL_EMIT_COMMONjk/no-diff-emit-commonJeff King2016-02-222-19/+0
| |/
* | merge-file: ensure that conflict sections match eol stylejs/xmerge-marker-eolJohannes Schindelin2016-01-271-14/+23
* | merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin2016-01-271-4/+57
|/
* git-merge-file: do not add LF at EOF while applying unrelated changemk/merge-incomplete-filesMax Kirillov2014-06-301-2/+2
* C: have space around && and || operatorsJunio C Hamano2013-10-161-1/+1
* diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-197-8/+89
* Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-122-2/+2
* Merge branch 'rs/xdiff-fast-hash-fix'Junio C Hamano2012-05-251-15/+15
|\
| * xdiff: import new 32-bit version of count_masked_bytes()René Scharfe2012-05-231-13/+5
| * xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe2012-05-231-1/+7
| * xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machinesRené Scharfe2012-05-221-3/+5
* | xdiff: remove unused functionsRené Scharfe2012-05-092-46/+0
* | xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe2012-05-092-6/+1
* | xdiff: add hunk_func()René Scharfe2012-05-092-0/+22
* | Merge branch 'tr/xdiff-fast-hash'Junio C Hamano2012-05-021-0/+106
|\ \ | |/
| * xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZEThomas Rast2012-05-011-29/+23
| * xdiff: load full words in the inner loop of xdl_hash_recordThomas Rast2012-04-091-0/+112
* | Merge branch 'jc/diff-algo-cleanup'Junio C Hamano2012-04-155-21/+18
|\ \ | |/ |/|
| * xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanupJunio C Hamano2012-02-195-16/+18
| * xdiff: remove XDL_PATCH_* macrosJunio C Hamano2012-02-191-5/+0
* | Merge branch 'rs/diff-postimage-in-context'Junio C Hamano2012-01-291-6/+6
|\ \ | |/ |/|
| * xdiff: print post-image for common records instead of pre-imagers/diff-postimage-in-contextRené Scharfe2012-01-061-6/+6
View Lorry Controller Status