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