| Commit message (Expand) | Author | Age | Files | Lines |
* | xdiff: don't trim common tail with -W | René Scharfe | 2016-05-31 | 1 | -6/+4 |
* | convert trivial cases to ALLOC_ARRAY | Jeff King | 2016-02-22 | 1 | -1/+1 |
* | xdiff: reject files larger than ~1GB | Jeff King | 2015-09-28 | 1 | -0/+3 |
* | xdiff: remove emit_func() and xdi_diff_hunks() | René Scharfe | 2012-05-09 | 1 | -44/+0 |
* | add, merge, diff: do not use strcasecmp to compare config variable names | Jonathan Nieder | 2011-05-14 | 1 | -1/+1 |
* | Merge branch 'rs/maint-diff-fd-leak' into maint | Junio C Hamano | 2010-12-26 | 1 | -1/+3 |
|\ |
|
| * | close file on error in read_mmfile() | René Scharfe | 2010-12-26 | 1 | -1/+3 |
* | | xdiff-interface.c: always trim trailing space from xfuncname matches | Brandon Casey | 2010-09-09 | 1 | -3/+2 |
* | | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2010-05-04 | 1 | -5/+6 |
|\ \ |
|
| * | | remove ecb parameter from xdi_diff_outf() | René Scharfe | 2010-05-04 | 1 | -5/+6 |
| |/ |
|
* | | refactor duplicated fill_mm() in checkout and merge-recursive | Michael Lukashov | 2010-02-17 | 1 | -0/+17 |
|/ |
|
* | userdiff: add xdiff_clear_find_func() | René Scharfe | 2009-07-01 | 1 | -0/+15 |
* | Remove unused function scope local variables | Benjamin Kramer | 2009-03-07 | 1 | -2/+1 |
* | xdiff-interface.c: remove 10 duplicated lines | Jim Meyering | 2008-11-26 | 1 | -11/+0 |
* | Merge branch 'rs/blame' | Junio C Hamano | 2008-11-08 | 1 | -1/+48 |
|\ |
|
| * | add xdi_diff_hunks() for callers that only need hunk lengths | René Scharfe | 2008-10-25 | 1 | -1/+48 |
* | | Merge branch 'maint' | Junio C Hamano | 2008-10-17 | 1 | -0/+10 |
|\ \
| |/
|/| |
|
| * | xdiff-interface.c: strip newline (and cr) from line before pattern matching | Brandon Casey | 2008-10-16 | 1 | -1/+11 |
* | | xdiff-interface.c: strip newline (and cr) from line before pattern matching | Brandon Casey | 2008-10-02 | 1 | -1/+11 |
* | | Merge branch 'bc/master-diff-hunk-header-fix' | Shawn O. Pearce | 2008-09-29 | 1 | -9/+12 |
|\ \ |
|
| * | | diff: fix "multiple regexp" semantics to find hunk header comment | Junio C Hamano | 2008-09-20 | 1 | -7/+10 |
| * | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix | Junio C Hamano | 2008-09-18 | 1 | -2/+2 |
| |\ \
| | |/ |
|
| | * | diff.c: associate a flag with each pattern and use it for compiling regex | Brandon Casey | 2008-09-18 | 1 | -2/+2 |
* | | | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 2008-09-29 | 1 | -0/+20 |
|\ \ \
| |/ /
|/| | |
|
| * | | merge.conflictstyle: choose between "merge" and "diff3 -m" styles | Junio C Hamano | 2008-08-30 | 1 | -0/+20 |
| |/ |
|
* | | xdiff-interface: hide the whole "xdiff_emit_state" business from the caller | Junio C Hamano | 2008-08-14 | 1 | -5/+18 |
* | | Use strbuf for struct xdiff_emit_state's remainder | Brian Downing | 2008-08-13 | 1 | -22/+10 |
* | | Make xdi_diff_outf interface for running xdiff_outf diffs | Brian Downing | 2008-08-13 | 1 | -1/+12 |
|/ |
|
* | Merge branch 'maint' | Junio C Hamano | 2008-03-14 | 1 | -2/+2 |
|\ |
|
| * | merge-file: handle empty files gracefully | Johannes Schindelin | 2008-03-13 | 1 | -2/+2 |
* | | Avoid unnecessary "if-before-free" tests. | Jim Meyering | 2008-02-22 | 1 | -2/+1 |
|/ |
|
* | Re(-re)*fix trim_common_tail() | Linus Torvalds | 2007-12-20 | 1 | -4/+7 |
* | Re-re-re-fix common tail optimization | Junio C Hamano | 2007-12-16 | 1 | -1/+1 |
* | trim_common_tail: brown paper bag fix. | Jeff King | 2007-12-16 | 1 | -5/+4 |
* | xdiff tail trimming: use correct type. | Junio C Hamano | 2007-12-14 | 1 | -3/+2 |
* | xdi_diff: trim common trailing lines | Junio C Hamano | 2007-12-13 | 1 | -1/+33 |
* | xdl_diff: identify call sites. | Junio C Hamano | 2007-12-13 | 1 | -0/+5 |
* | Per-path attribute based hunk header selection. | Junio C Hamano | 2007-07-06 | 1 | -0/+71 |
* | War on whitespace | Junio C Hamano | 2007-06-07 | 1 | -2/+0 |
* | Move buffer_is_binary() to xdiff-interface.h | Johannes Schindelin | 2007-06-04 | 1 | -0/+8 |
* | Cast 64 bit off_t to 32 bit size_t | Shawn O. Pearce | 2007-03-07 | 1 | -3/+5 |
* | move read_mmfile() into xdiff-interface | Johannes Schindelin | 2006-12-21 | 1 | -0/+19 |
* | Use xrealloc instead of realloc | Jonas Fonseca | 2006-08-26 | 1 | -6/+6 |
* | Match ofs/cnt types in diff interface. | Junio C Hamano | 2006-04-06 | 1 | -4/+4 |
* | combine-diff: move the code to parse hunk-header into common library. | Junio C Hamano | 2006-04-05 | 1 | -0/+46 |
* | combine-diff: refactor built-in xdiff interface. | Junio C Hamano | 2006-04-05 | 1 | -0/+58 |