summaryrefslogtreecommitdiff
path: root/xdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
* | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-192-16/+70
|\ \
| * | diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-102-6/+49
| * | xdiff: factor out get_func_line()René Scharfe2011-10-101-16/+27
* | | Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano2011-10-131-3/+7
|\ \ \ | |/ / |/| |
| * | Revert removal of multi-match discard heuristic in 27af01René Scharfe2011-09-261-3/+7
* | | Merge branch 'rc/histogram-diff'Junio C Hamano2011-09-061-0/+2
|\ \ \
| * | | xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()Tay Ray Chuan2011-08-311-0/+2
* | | | Merge branch 'rc/histogram-diff' into HEADJunio C Hamano2011-08-178-125/+470
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | xdiff/xhistogram: drop need for additional variableTay Ray Chuan2011-08-081-5/+4
| * | xdiff/xhistogram: rely on xdl_trim_ends()Tay Ray Chuan2011-08-081-27/+4
| * | xdiff/xhistogram: rework handling of recursed resultsTay Ray Chuan2011-08-081-6/+9
| * | xdiff: do away with xdl_mmfile_next()Tay Ray Chuan2011-08-033-20/+2
| * | xdiff/xprepare: use a smaller sample size for histogram diffTay Ray Chuan2011-07-123-10/+17
| * | xdiff/xprepare: skip classificationTay Ray Chuan2011-07-121-8/+16
| * | teach --histogram to diffTay Ray Chuan2011-07-124-0/+390
| * | xdiff/xpatience: factor out fall-back-diff functionTay Ray Chuan2011-07-073-25/+35
| * | xdiff/xprepare: refactor abort cleanupsTay Ray Chuan2011-07-071-59/+32
| * | xdiff/xprepare: use memset()Tay Ray Chuan2011-07-071-7/+3
| |/
* | xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()Tay Ray Chuan2011-08-171-36/+50
|/
* Merge branch 'cb/diff-fname-optim'Junio C Hamano2010-11-171-24/+14
|\
| * diff: avoid repeated scanning while looking for funcnameRené Scharfe2010-09-301-24/+14
* | xdiff: cast arguments for ctype functions to unsigned charJonathan Nieder2010-10-063-10/+11
|/
* xdiff: optimise for no whitespace difference when ignoring whitespace.Dylan Reid2010-07-051-1/+3
* xdiff/xmerge.c: use memset() instead of explicit for-loopAlexey Mahotkin2010-05-011-9/+8
* xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder2010-03-202-10/+14
* xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2010-03-202-2/+15
* refactor merge flags into xmparam_tBert Wesarg2010-03-022-12/+11
* make union merge an xdl merge favorBert Wesarg2010-03-022-7/+14
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-01-202-10/+25
|\
| * xdl_merge(): allow passing down marker_size in xmparam_tJunio C Hamano2010-01-162-8/+18
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-162-2/+7
* | git-merge-file --ours, --theirsJunio C Hamano2009-11-292-3/+14
|/
* Merge branch 'tf/diff-whitespace-incomplete-line'Junio C Hamano2009-08-311-33/+53
|\
| * xutils: Fix xdl_recmatch() on incomplete linesJunio C Hamano2009-08-231-31/+49
| * xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano2009-08-231-2/+4
| * Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano2009-02-051-2/+4
| |\
* | | refactor: use bitsizeof() instead of 8 * sizeof()Pierre Habouzit2009-07-221-1/+1
* | | Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano2009-06-021-16/+15
|\ \ \
| * | | Change xdl_merge to generate output even for null mergesCharles Bailey2009-05-241-16/+15
* | | | Fix typos / spelling in commentsMike Ralphson2009-04-221-1/+1
* | | | Fix various dead stores found by the clang static analyzerBenjamin Kramer2009-03-152-4/+3
* | | | Merge branch 'js/patience-diff'Junio C Hamano2009-01-235-1/+389
|\ \ \ \
| * | | | Implement the patience diff algorithmJohannes Schindelin2009-01-075-1/+389
| | |/ / | |/| |
* | | | Merge branch 'kc/maint-diff-bwi-fix'Junio C Hamano2009-01-211-2/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix combined use of whitespace ignore options to diffKeith Cascio2009-01-191-2/+4
| | |/ | |/|
View Lorry Controller Status