summaryrefslogtreecommitdiff
path: root/xdiff
AgeCommit message (Expand)Author
2011-10-19Merge branch 'rs/diff-whole-function'Junio C Hamano
2011-10-14Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano
2011-10-10diff: add option to show whole functions as contextRené Scharfe
2011-10-10xdiff: factor out get_func_line()René Scharfe
2011-09-26Revert removal of multi-match discard heuristic in 27af01René Scharfe
2011-09-06Merge branch 'rc/histogram-diff'Junio C Hamano
2011-08-31xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()Tay Ray Chuan
2011-08-18Merge branch 'rc/histogram-diff' into HEADJunio C Hamano
2011-08-18xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Tay Ray Chuan
2011-08-08xdiff/xhistogram: drop need for additional variableTay Ray Chuan
2011-08-08xdiff/xhistogram: rely on xdl_trim_ends()Tay Ray Chuan
2011-08-08xdiff/xhistogram: rework handling of recursed resultsTay Ray Chuan
2011-08-03xdiff: do away with xdl_mmfile_next()Tay Ray Chuan
2011-07-12xdiff/xprepare: use a smaller sample size for histogram diffTay Ray Chuan
2011-07-12xdiff/xprepare: skip classificationTay Ray Chuan
2011-07-12teach --histogram to diffTay Ray Chuan
2011-07-07xdiff/xpatience: factor out fall-back-diff functionTay Ray Chuan
2011-07-07xdiff/xprepare: refactor abort cleanupsTay Ray Chuan
2011-07-07xdiff/xprepare: use memset()Tay Ray Chuan
2010-11-17Merge branch 'cb/diff-fname-optim'Junio C Hamano
2010-10-06xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder
2010-09-30diff: avoid repeated scanning while looking for funcnameRené Scharfe
2010-07-06xdiff: optimise for no whitespace difference when ignoring whitespace.Dylan Reid
2010-05-01xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin
2010-03-21xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder
2010-03-21xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder
2010-03-02refactor merge flags into xmparam_tBert Wesarg
2010-03-02make union merge an xdl merge favorBert Wesarg
2010-01-21Merge branch 'jc/conflict-marker-size'Junio C Hamano
2010-01-17xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano
2010-01-17xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano
2009-11-30git-merge-file --ours, --theirsJunio C Hamano
2009-09-01Merge branch 'tf/diff-whitespace-incomplete-line'Junio C Hamano
2009-08-23xutils: Fix xdl_recmatch() on incomplete linesJunio C Hamano
2009-08-23xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano
2009-07-23refactor: use bitsizeof() instead of 8 * sizeof()Pierre Habouzit
2009-06-02Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano
2009-05-25Change xdl_merge to generate output even for null mergesCharles Bailey
2009-04-23Fix typos / spelling in commentsMike Ralphson
2009-03-16Fix various dead stores found by the clang static analyzerBenjamin Kramer
2009-02-06Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano
2009-01-24Merge branch 'js/patience-diff'Junio C Hamano
2009-01-22Merge branch 'kc/maint-diff-bwi-fix'Junio C Hamano
2009-01-20Fix combined use of whitespace ignore options to diffKeith Cascio
2009-01-07Implement the patience diff algorithmJohannes Schindelin
2008-12-29diff: add option to show context between close hunksRené Scharfe
2008-12-03xdiff: give up scanning similar lines earlyDavide Libenzi
2008-11-13Merge branch 'dl/xdiff'Junio C Hamano
2008-11-08xdiff: give up scanning similar lines earlyDavide Libenzi
2008-10-25Allow alternate "low-level" emit function from xdl_diffBrian Downing