Age | Commit message (Expand) | Author | Files | Lines |
2016-03-04 | xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits | Ramsay Jones | 1 | -1/+1 |
2016-02-26 | Merge branch 'ps/plug-xdl-merge-leak' | Junio C Hamano | 1 | -2/+7 |
2016-02-26 | Merge branch 'jk/no-diff-emit-common' | Junio C Hamano | 2 | -19/+0 |
2016-02-23 | xdiff/xmerge: fix memory leak in xdl_merge | Patrick Steinhardt | 1 | -2/+7 |
2016-02-22 | xdiff: drop XDL_EMIT_COMMON | Jeff King | 2 | -19/+0 |
2016-01-27 | merge-file: ensure that conflict sections match eol style | Johannes Schindelin | 1 | -14/+23 |
2016-01-27 | merge-file: let conflict markers match end-of-line style of the context | Johannes Schindelin | 1 | -4/+57 |
2014-06-30 | git-merge-file: do not add LF at EOF while applying unrelated change | Max Kirillov | 1 | -2/+2 |
2013-10-16 | C: have space around && and || operators | Junio C Hamano | 1 | -1/+1 |
2013-06-19 | diff: add --ignore-blank-lines option | Antoine Pelisse | 7 | -8/+89 |
2013-04-12 | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2 | -2/+2 |
2012-05-25 | Merge branch 'rs/xdiff-fast-hash-fix' | Junio C Hamano | 1 | -15/+15 |
2012-05-23 | xdiff: import new 32-bit version of count_masked_bytes() | René Scharfe | 1 | -13/+5 |
2012-05-23 | xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines | René Scharfe | 1 | -1/+7 |
2012-05-22 | xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines | René Scharfe | 1 | -3/+5 |
2012-05-09 | xdiff: remove unused functions | René Scharfe | 2 | -46/+0 |
2012-05-09 | xdiff: remove emit_func() and xdi_diff_hunks() | René Scharfe | 2 | -6/+1 |
2012-05-09 | xdiff: add hunk_func() | René Scharfe | 2 | -0/+22 |
2012-05-02 | Merge branch 'tr/xdiff-fast-hash' | Junio C Hamano | 1 | -0/+106 |
2012-05-01 | xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE | Thomas Rast | 1 | -29/+23 |
2012-04-15 | Merge branch 'jc/diff-algo-cleanup' | Junio C Hamano | 5 | -21/+18 |
2012-04-09 | xdiff: load full words in the inner loop of xdl_hash_record | Thomas Rast | 1 | -0/+112 |
2012-02-19 | xdiff: PATIENCE/HISTOGRAM are not independent option bits | Junio C Hamano | 5 | -16/+18 |
2012-02-19 | xdiff: remove XDL_PATCH_* macros | Junio C Hamano | 1 | -5/+0 |
2012-01-29 | Merge branch 'rs/diff-postimage-in-context' | Junio C Hamano | 1 | -6/+6 |
2012-01-06 | xdiff: print post-image for common records instead of pre-image | René Scharfe | 1 | -6/+6 |
2011-10-19 | Merge branch 'rs/diff-whole-function' | Junio C Hamano | 2 | -16/+70 |
2011-10-13 | Merge branch 'rs/diff-cleanup-records-fix' | Junio C Hamano | 1 | -3/+7 |
2011-10-10 | diff: add option to show whole functions as context | René Scharfe | 2 | -6/+49 |
2011-10-10 | xdiff: factor out get_func_line() | René Scharfe | 1 | -16/+27 |
2011-09-26 | Revert removal of multi-match discard heuristic in 27af01 | René Scharfe | 1 | -3/+7 |
2011-09-06 | Merge branch 'rc/histogram-diff' | Junio C Hamano | 1 | -0/+2 |
2011-08-31 | xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env() | Tay Ray Chuan | 1 | -0/+2 |
2011-08-17 | Merge branch 'rc/histogram-diff' into HEAD | Junio C Hamano | 8 | -125/+470 |
2011-08-17 | xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records() | Tay Ray Chuan | 1 | -36/+50 |
2011-08-08 | xdiff/xhistogram: drop need for additional variable | Tay Ray Chuan | 1 | -5/+4 |
2011-08-08 | xdiff/xhistogram: rely on xdl_trim_ends() | Tay Ray Chuan | 1 | -27/+4 |
2011-08-08 | xdiff/xhistogram: rework handling of recursed results | Tay Ray Chuan | 1 | -6/+9 |
2011-08-03 | xdiff: do away with xdl_mmfile_next() | Tay Ray Chuan | 3 | -20/+2 |
2011-07-12 | xdiff/xprepare: use a smaller sample size for histogram diff | Tay Ray Chuan | 3 | -10/+17 |
2011-07-12 | xdiff/xprepare: skip classification | Tay Ray Chuan | 1 | -8/+16 |
2011-07-12 | teach --histogram to diff | Tay Ray Chuan | 4 | -0/+390 |
2011-07-07 | xdiff/xpatience: factor out fall-back-diff function | Tay Ray Chuan | 3 | -25/+35 |
2011-07-07 | xdiff/xprepare: refactor abort cleanups | Tay Ray Chuan | 1 | -59/+32 |
2011-07-07 | xdiff/xprepare: use memset() | Tay Ray Chuan | 1 | -7/+3 |
2010-11-17 | Merge branch 'cb/diff-fname-optim' | Junio C Hamano | 1 | -24/+14 |
2010-10-06 | xdiff: cast arguments for ctype functions to unsigned char | Jonathan Nieder | 3 | -10/+11 |
2010-09-30 | diff: avoid repeated scanning while looking for funcname | René Scharfe | 1 | -24/+14 |
2010-07-05 | xdiff: optimise for no whitespace difference when ignoring whitespace. | Dylan Reid | 1 | -1/+3 |
2010-05-01 | xdiff/xmerge.c: use memset() instead of explicit for-loop | Alexey Mahotkin | 1 | -9/+8 |