Age | Commit message (Expand) | Author | Files | Lines |
2009-08-31 | Merge branch 'tf/diff-whitespace-incomplete-line' | Junio C Hamano | 1 | -33/+53 |
2009-08-23 | xutils: Fix xdl_recmatch() on incomplete lines | Junio C Hamano | 1 | -31/+49 |
2009-08-23 | xutils: Fix hashing an incomplete line with whitespaces at the end | Junio C Hamano | 1 | -2/+4 |
2009-07-22 | refactor: use bitsizeof() instead of 8 * sizeof() | Pierre Habouzit | 1 | -1/+1 |
2009-06-02 | Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint | Junio C Hamano | 1 | -16/+15 |
2009-05-24 | Change xdl_merge to generate output even for null merges | Charles Bailey | 1 | -16/+15 |
2009-04-22 | Fix typos / spelling in comments | Mike Ralphson | 1 | -1/+1 |
2009-03-15 | Fix various dead stores found by the clang static analyzer | Benjamin Kramer | 2 | -4/+3 |
2009-02-05 | Merge branch 'kc/maint-diff-bwi-fix' into maint | Junio C Hamano | 1 | -2/+4 |
2009-01-23 | Merge branch 'js/patience-diff' | Junio C Hamano | 5 | -1/+389 |
2009-01-21 | Merge branch 'kc/maint-diff-bwi-fix' | Junio C Hamano | 1 | -2/+4 |
2009-01-19 | Fix combined use of whitespace ignore options to diff | Keith Cascio | 1 | -2/+4 |
2009-01-07 | Implement the patience diff algorithm | Johannes Schindelin | 5 | -1/+389 |
2008-12-29 | diff: add option to show context between close hunks | René Scharfe | 2 | -1/+3 |
2008-12-02 | xdiff: give up scanning similar lines early | Davide Libenzi | 1 | -2/+13 |
2008-11-12 | Merge branch 'dl/xdiff' | Junio C Hamano | 1 | -2/+13 |
2008-11-08 | xdiff: give up scanning similar lines early | Davide Libenzi | 1 | -2/+13 |
2008-10-25 | Allow alternate "low-level" emit function from xdl_diff | Brian Downing | 4 | -3/+8 |
2008-08-30 | xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less | Junio C Hamano | 1 | -0/+9 |
2008-08-30 | xmerge.c: minimum readability fixups | Junio C Hamano | 1 | -7/+7 |
2008-08-30 | xdiff-merge: optionally show conflicts in "diff3 -m" style | Junio C Hamano | 2 | -19/+90 |
2008-08-30 | xdl_fill_merge_buffer(): separate out a too deeply nested function | Junio C Hamano | 1 | -51/+70 |
2008-02-18 | xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM | Johannes Schindelin | 2 | -4/+28 |
2008-02-18 | xdl_merge(): make XDL_MERGE_ZEALOUS output simpler | Johannes Schindelin | 1 | -1/+46 |
2007-11-15 | Remove unreachable statements | Guido Ostkamp | 2 | -4/+0 |
2007-07-06 | Per-path attribute based hunk header selection. | Junio C Hamano | 2 | -14/+27 |
2007-06-08 | Missing statics. | Pierre Habouzit | 1 | -2/+2 |
2007-06-07 | War on whitespace | Junio C Hamano | 12 | -12/+0 |
2007-03-19 | xdiff/xutils.c(xdl_hash_record): factor out whitespace handling | Johannes Schindelin | 1 | -2/+20 |
2007-02-13 | teach diff machinery about --ignore-space-at-eol | Johannes Schindelin | 2 | -1/+26 |
2006-12-30 | Fix yet another subtle xdl_merge() bug | Johannes Schindelin | 1 | -2/+5 |
2006-12-28 | xdl_merge(): fix a segmentation fault when refining conflicts | Johannes Schindelin | 1 | -0/+4 |
2006-12-12 | Merge branch 'master' into js/merge | Junio C Hamano | 1 | -1/+2 |
2006-12-05 | xdl_merge(): fix and simplify conflict handling | Johannes Schindelin | 1 | -16/+5 |
2006-12-04 | diff -b: ignore whitespace at end of line | Johannes Schindelin | 1 | -1/+2 |
2006-12-02 | xdl_merge(): fix thinko | Johannes Schindelin | 1 | -2/+2 |
2006-12-02 | xdl_merge(): fix an off-by-one bug | Johannes Schindelin | 1 | -5/+5 |
2006-12-02 | xmerge: make return value from xdl_merge() more usable. | Junio C Hamano | 1 | -10/+7 |
2006-12-02 | xdiff: add xdl_merge() | Johannes Schindelin | 4 | -2/+442 |
2006-11-23 | Increase length of function name buffer | Andy Parkins | 1 | -1/+1 |
2006-10-25 | xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines | Petr Baudis | 1 | -2/+1 |
2006-10-23 | xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header. | Jim Meyering | 1 | -1/+1 |
2006-10-16 | Merge branch 'maint' | Junio C Hamano | 1 | -2/+3 |
2006-10-16 | Fix hash function in xdiff library | Linus Torvalds | 1 | -2/+3 |
2006-10-12 | diff: fix 2 whitespace issues | Johannes Schindelin | 1 | -17/+12 |
2006-07-12 | Merge branch 'lt/merge-tree' | Junio C Hamano | 2 | -0/+19 |
2006-07-10 | Fix more typos, primarily in the code | Pavel Roskin | 1 | -3/+3 |
2006-06-28 | xdiff: generate "anti-diffs" aka what is common to two files | Linus Torvalds | 2 | -0/+19 |
2006-06-23 | Teach diff about -b and -w flags | Johannes Schindelin | 7 | -16/+71 |
2006-06-19 | xdiff: minor changes to match libxdiff-0.21 | Junio C Hamano | 2 | -7/+5 |