aboutsummaryrefslogtreecommitdiffstats
path: root/xdiff-interface.c
AgeCommit message (Expand)AuthorFilesLines
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe1-44/+0
2011-05-14add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder1-1/+1
2010-12-26Merge branch 'rs/maint-diff-fd-leak' into maintJunio C Hamano1-1/+3
2010-12-26close file on error in read_mmfile()René Scharfe1-1/+3
2010-09-09xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey1-3/+2
2010-05-04Merge branch 'maint-1.7.0' into maintJunio C Hamano1-5/+6
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe1-5/+6
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov1-0/+17
2009-07-01userdiff: add xdiff_clear_find_func()René Scharfe1-0/+15
2009-03-07Remove unused function scope local variablesBenjamin Kramer1-2/+1
2008-11-26xdiff-interface.c: remove 10 duplicated linesJim Meyering1-11/+0
2008-11-08Merge branch 'rs/blame'Junio C Hamano1-1/+48
2008-10-25add xdi_diff_hunks() for callers that only need hunk lengthsRené Scharfe1-1/+48
2008-10-17Merge branch 'maint'Junio C Hamano1-0/+10
2008-10-16xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey1-1/+11
2008-10-02xdiff-interface.c: strip newline (and cr) from line before pattern matchingBrandon Casey1-1/+11
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce1-9/+12
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce1-0/+20
2008-09-20diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano1-7/+10
2008-09-18Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano1-2/+2
2008-09-18diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey1-2/+2
2008-08-30merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano1-0/+20
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano1-5/+18
2008-08-13Use strbuf for struct xdiff_emit_state's remainderBrian Downing1-22/+10
2008-08-13Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing1-1/+12
2008-03-14Merge branch 'maint'Junio C Hamano1-2/+2
2008-03-13merge-file: handle empty files gracefullyJohannes Schindelin1-2/+2
2008-02-22Avoid unnecessary "if-before-free" tests.Jim Meyering1-2/+1
2007-12-20Re(-re)*fix trim_common_tail()Linus Torvalds1-4/+7
2007-12-16Re-re-re-fix common tail optimizationJunio C Hamano1-1/+1
2007-12-16trim_common_tail: brown paper bag fix.Jeff King1-5/+4
2007-12-14xdiff tail trimming: use correct type.Junio C Hamano1-3/+2
2007-12-13xdi_diff: trim common trailing linesJunio C Hamano1-1/+33
2007-12-13xdl_diff: identify call sites.Junio C Hamano1-0/+5
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano1-0/+71
2007-06-07War on whitespaceJunio C Hamano1-2/+0
2007-06-04Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin1-0/+8
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce1-3/+5
2006-12-21move read_mmfile() into xdiff-interfaceJohannes Schindelin1-0/+19
2006-08-26Use xrealloc instead of reallocJonas Fonseca1-6/+6
2006-04-06Match ofs/cnt types in diff interface.Junio C Hamano1-4/+4
2006-04-05combine-diff: move the code to parse hunk-header into common library.Junio C Hamano1-0/+46
2006-04-05combine-diff: refactor built-in xdiff interface.Junio C Hamano1-0/+58
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-16 09:05:19 +0000