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