aboutsummaryrefslogtreecommitdiff
path: root/xdiff-interface.c
Commit message (Expand)AuthorAge
* add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-14
* Merge branch 'rs/maint-diff-fd-leak' into maintJunio C Hamano2010-12-26
|\
| * close file on error in read_mmfile()René Scharfe2010-12-26
* | xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey2010-09-09
* | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-04
|\ \
| * | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-04
| |/
* | refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov2010-02-17
|/
* userdiff: add xdiff_clear_find_func()René Scharfe2009-07-01
* Remove unused function scope local variablesBenjamin Kramer2009-03-07
* xdiff-interface.c: remove 10 duplicated linesJim Meyering2008-11-26
* Merge branch 'rs/blame'Junio C Hamano2008-11-08
|\
| * add xdi_diff_hunks() for callers that only need hunk lengthsRené Scharfe2008-10-25
* | Merge branch 'maint'Junio C Hamano2008-10-17
|\ \ | |/ |/|
| * xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey2008-10-16
* | xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey2008-10-02
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-29
|\ \
| * | diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano2008-09-20
| * | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-18
| |\ \ | | |/
| | * diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-18
* | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\ \ \ | |/ / |/| |
| * | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-30
| |/
* | xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano2008-08-14
* | Use strbuf for struct xdiff_emit_state's remainderBrian Downing2008-08-13
* | Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing2008-08-13
|/
* Merge branch 'maint'Junio C Hamano2008-03-14
|\
| * merge-file: handle empty files gracefullyJohannes Schindelin2008-03-13
* | Avoid unnecessary "if-before-free" tests.Jim Meyering2008-02-22
|/
* Re(-re)*fix trim_common_tail()Linus Torvalds2007-12-20
* Re-re-re-fix common tail optimizationJunio C Hamano2007-12-16
* trim_common_tail: brown paper bag fix.Jeff King2007-12-16
* xdiff tail trimming: use correct type.Junio C Hamano2007-12-14
* xdi_diff: trim common trailing linesJunio C Hamano2007-12-13
* xdl_diff: identify call sites.Junio C Hamano2007-12-13
* Per-path attribute based hunk header selection.Junio C Hamano2007-07-06
* War on whitespaceJunio C Hamano2007-06-07
* Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin2007-06-04
* Cast 64 bit off_t to 32 bit size_tShawn O. Pearce2007-03-07
* move read_mmfile() into xdiff-interfaceJohannes Schindelin2006-12-21
* Use xrealloc instead of reallocJonas Fonseca2006-08-26
* Match ofs/cnt types in diff interface.Junio C Hamano2006-04-06
* combine-diff: move the code to parse hunk-header into common library.Junio C Hamano2006-04-05
* combine-diff: refactor built-in xdiff interface.Junio C Hamano2006-04-05