| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'rs/xdiff-fast-hash-fix' | Junio C Hamano | 2012-05-25 | 1 | -15/+15 |
|\ |
|
| * | xdiff: import new 32-bit version of count_masked_bytes() | René Scharfe | 2012-05-23 | 1 | -13/+5 |
| * | xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines | René Scharfe | 2012-05-23 | 1 | -1/+7 |
| * | xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines | René Scharfe | 2012-05-22 | 1 | -3/+5 |
* | | xdiff: remove unused functions | René Scharfe | 2012-05-09 | 2 | -46/+0 |
* | | xdiff: remove emit_func() and xdi_diff_hunks() | René Scharfe | 2012-05-09 | 2 | -6/+1 |
* | | xdiff: add hunk_func() | René Scharfe | 2012-05-09 | 2 | -0/+22 |
* | | Merge branch 'tr/xdiff-fast-hash' | Junio C Hamano | 2012-05-02 | 1 | -0/+106 |
|\ \
| |/ |
|
| * | xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE | Thomas Rast | 2012-05-01 | 1 | -29/+23 |
| * | xdiff: load full words in the inner loop of xdl_hash_record | Thomas Rast | 2012-04-09 | 1 | -0/+112 |
* | | Merge branch 'jc/diff-algo-cleanup' | Junio C Hamano | 2012-04-15 | 5 | -21/+18 |
|\ \
| |/
|/| |
|
| * | xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanup | Junio C Hamano | 2012-02-19 | 5 | -16/+18 |
| * | xdiff: remove XDL_PATCH_* macros | Junio C Hamano | 2012-02-19 | 1 | -5/+0 |
* | | Merge branch 'rs/diff-postimage-in-context' | Junio C Hamano | 2012-01-29 | 1 | -6/+6 |
|\ \
| |/
|/| |
|
| * | xdiff: print post-image for common records instead of pre-imagers/diff-postimage-in-context | René Scharfe | 2012-01-06 | 1 | -6/+6 |
* | | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2011-10-19 | 2 | -16/+70 |
|\ \ |
|
| * | | diff: add option to show whole functions as contextrs/diff-whole-function | René Scharfe | 2011-10-10 | 2 | -6/+49 |
| * | | xdiff: factor out get_func_line() | René Scharfe | 2011-10-10 | 1 | -16/+27 |
* | | | Merge branch 'rs/diff-cleanup-records-fix' | Junio C Hamano | 2011-10-13 | 1 | -3/+7 |
|\ \ \
| |/ /
|/| | |
|
| * | | Revert removal of multi-match discard heuristic in 27af01 | René Scharfe | 2011-09-26 | 1 | -3/+7 |
* | | | Merge branch 'rc/histogram-diff' | Junio C Hamano | 2011-09-06 | 1 | -0/+2 |
|\ \ \ |
|
| * | | | xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env() | Tay Ray Chuan | 2011-08-31 | 1 | -0/+2 |
* | | | | Merge branch 'rc/histogram-diff' into HEAD | Junio C Hamano | 2011-08-17 | 8 | -125/+470 |
|\ \ \ \
| |/ / /
| | / /
| |/ /
|/| | |
|
| * | | xdiff/xhistogram: drop need for additional variable | Tay Ray Chuan | 2011-08-08 | 1 | -5/+4 |
| * | | xdiff/xhistogram: rely on xdl_trim_ends() | Tay Ray Chuan | 2011-08-08 | 1 | -27/+4 |
| * | | xdiff/xhistogram: rework handling of recursed results | Tay Ray Chuan | 2011-08-08 | 1 | -6/+9 |
| * | | xdiff: do away with xdl_mmfile_next() | Tay Ray Chuan | 2011-08-03 | 3 | -20/+2 |
| * | | xdiff/xprepare: use a smaller sample size for histogram diff | Tay Ray Chuan | 2011-07-12 | 3 | -10/+17 |
| * | | xdiff/xprepare: skip classification | Tay Ray Chuan | 2011-07-12 | 1 | -8/+16 |
| * | | teach --histogram to diff | Tay Ray Chuan | 2011-07-12 | 4 | -0/+390 |
| * | | xdiff/xpatience: factor out fall-back-diff function | Tay Ray Chuan | 2011-07-07 | 3 | -25/+35 |
| * | | xdiff/xprepare: refactor abort cleanups | Tay Ray Chuan | 2011-07-07 | 1 | -59/+32 |
| * | | xdiff/xprepare: use memset() | Tay Ray Chuan | 2011-07-07 | 1 | -7/+3 |
| |/ |
|
* | | xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records() | Tay Ray Chuan | 2011-08-17 | 1 | -36/+50 |
|/ |
|
* | Merge branch 'cb/diff-fname-optim' | Junio C Hamano | 2010-11-17 | 1 | -24/+14 |
|\ |
|
| * | diff: avoid repeated scanning while looking for funcname | René Scharfe | 2010-09-30 | 1 | -24/+14 |
* | | xdiff: cast arguments for ctype functions to unsigned char | Jonathan Nieder | 2010-10-06 | 3 | -10/+11 |
|/ |
|
* | xdiff: optimise for no whitespace difference when ignoring whitespace. | Dylan Reid | 2010-07-05 | 1 | -1/+3 |
* | xdiff/xmerge.c: use memset() instead of explicit for-loop | Alexey Mahotkin | 2010-05-01 | 1 | -9/+8 |
* | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 2010-03-20 | 2 | -10/+14 |
* | xdl_merge(): add optional ancestor label to diff3-style output | Jonathan Nieder | 2010-03-20 | 2 | -2/+15 |
* | refactor merge flags into xmparam_t | Bert Wesarg | 2010-03-02 | 2 | -12/+11 |
* | make union merge an xdl merge favor | Bert Wesarg | 2010-03-02 | 2 | -7/+14 |
* | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-01-20 | 2 | -10/+25 |
|\ |
|
| * | xdl_merge(): allow passing down marker_size in xmparam_t | Junio C Hamano | 2010-01-16 | 2 | -8/+18 |
| * | xdl_merge(): introduce xmparam_t for merge specific parameters | Junio C Hamano | 2010-01-16 | 2 | -2/+7 |
* | | git-merge-file --ours, --theirs | Junio C Hamano | 2009-11-29 | 2 | -3/+14 |
|/ |
|
* | Merge branch 'tf/diff-whitespace-incomplete-line' | Junio C Hamano | 2009-08-31 | 1 | -33/+53 |
|\ |
|
| * | xutils: Fix xdl_recmatch() on incomplete lines | Junio C Hamano | 2009-08-23 | 1 | -31/+49 |
| * | xutils: Fix hashing an incomplete line with whitespaces at the end | Junio C Hamano | 2009-08-23 | 1 | -2/+4 |