aboutsummaryrefslogtreecommitdiff
path: root/xdiff
Commit message (Expand)AuthorAge
* xdiff: add recs_match helper functionJacob Keller2016-04-18
* 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
* | Merge branch 'rs/diff-postimage-in-context'Junio C Hamano2012-01-29
|\ \ | |/ |/|
| * xdiff: print post-image for common records instead of pre-imageRené Scharfe2012-01-06
* | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-19
|\ \
| * | diff: add option to show whole functions as contextRené Scharfe2011-10-10
| * | xdiff: factor out get_func_line()René Scharfe2011-10-10
* | | Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano2011-10-13
|\ \ \ | |/ / |/| |
| * | Revert removal of multi-match discard heuristic in 27af01René Scharfe2011-09-26
* | | Merge branch 'rc/histogram-diff'Junio C Hamano2011-09-06
|\ \ \
| * | | xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()Tay Ray Chuan2011-08-31
* | | | Merge branch 'rc/histogram-diff' into HEADJunio C Hamano2011-08-17
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | xdiff/xhistogram: drop need for additional variableTay Ray Chuan2011-08-08
| * | xdiff/xhistogram: rely on xdl_trim_ends()Tay Ray Chuan2011-08-08
| * | xdiff/xhistogram: rework handling of recursed resultsTay Ray Chuan2011-08-08
| * | xdiff: do away with xdl_mmfile_next()Tay Ray Chuan2011-08-03
| * | xdiff/xprepare: use a smaller sample size for histogram diffTay Ray Chuan2011-07-12
| * | xdiff/xprepare: skip classificationTay Ray Chuan2011-07-12
| * | teach --histogram to diffTay Ray Chuan2011-07-12
| * | xdiff/xpatience: factor out fall-back-diff functionTay Ray Chuan2011-07-07
| * | xdiff/xprepare: refactor abort cleanupsTay Ray Chuan2011-07-07
| * | xdiff/xprepare: use memset()Tay Ray Chuan2011-07-07
| |/
* | xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Tay Ray Chuan2011-08-17
|/
* Merge branch 'cb/diff-fname-optim'Junio C Hamano2010-11-17
|\
| * diff: avoid repeated scanning while looking for funcnameRené Scharfe2010-09-30
* | xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder2010-10-06
|/
* xdiff: optimise for no whitespace difference when ignoring whitespace.Dylan Reid2010-07-05
* xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin2010-05-01
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-20
* xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2010-03-20
* refactor merge flags into xmparam_tBert Wesarg2010-03-02
* make union merge an xdl merge favorBert Wesarg2010-03-02
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-20
|\
| * xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-16
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 08:54:05 +0000