aboutsummaryrefslogtreecommitdiff
path: root/xdiff
Commit message (Expand)AuthorAge
* Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano2011-10-21
|\
| * 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
| * xdl_merge(): introduce xmparam_t for merge specific parametersJunio C Hamano2010-01-16
* | git-merge-file --ours, --theirsJunio C Hamano2009-11-29
|/
* Merge branch 'tf/diff-whitespace-incomplete-line'Junio C Hamano2009-08-31
|\
| * xutils: Fix xdl_recmatch() on incomplete linesJunio C Hamano2009-08-23
| * xutils: Fix hashing an incomplete line with whitespaces at the endJunio C Hamano2009-08-23
| * Merge branch 'kc/maint-diff-bwi-fix' into maintJunio C Hamano2009-02-05
| |\
* | | refactor: use bitsizeof() instead of 8 * sizeof()Pierre Habouzit2009-07-22
* | | Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maintJunio C Hamano2009-06-02
|\ \ \
| * | | Change xdl_merge to generate output even for null mergesCharles Bailey2009-05-24
* | | | Fix typos / spelling in commentsMike Ralphson2009-04-22
* | | | Fix various dead stores found by the clang static analyzerBenjamin Kramer2009-03-15
* | | | Merge branch 'js/patience-diff'Junio C Hamano2009-01-23
|\ \ \ \
| * | | | Implement the patience diff algorithmJohannes Schindelin2009-01-07
| | |/ / | |/| |
* | | | Merge branch 'kc/maint-diff-bwi-fix'Junio C Hamano2009-01-21
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix combined use of whitespace ignore options to diffKeith Cascio2009-01-19
| | |/ | |/|
| * | xdiff: give up scanning similar lines earlyDavide Libenzi2008-12-02
* | | diff: add option to show context between close hunksRené Scharfe2008-12-29
| |/ |/|
* | Merge branch 'dl/xdiff'Junio C Hamano2008-11-12
|\ \
| * | xdiff: give up scanning similar lines earlyDavide Libenzi2008-11-08
* | | Allow alternate "low-level" emit function from xdl_diffBrian Downing2008-10-25
|/ /
* | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or lessJunio C Hamano2008-08-30
* | xmerge.c: minimum readability fixupsJunio C Hamano2008-08-30
* | xdiff-merge: optionally show conflicts in "diff3 -m" styleJunio C Hamano2008-08-30
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 03:22:35 +0000