aboutsummaryrefslogtreecommitdiffstats
path: root/xdiff-interface.h
AgeCommit message (Expand)AuthorFilesLines
2024-03-14xdiff-interface: refactor parsing of merge.conflictstylePhillip Wood1-0/+1
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-1/+3
2023-04-24hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren1-1/+1
2023-02-23treewide: remove unnecessary cache.h includesElijah Newren1-1/+1
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason1-8/+0
2021-05-11pickaxe -G: terminate early on matching linesÆvar Arnfjörð Bjarmason1-0/+4
2021-05-11xdiff-interface: allow early return from xdiff_emit_line_fnÆvar Arnfjörð Bjarmason1-0/+17
2021-05-11xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason1-1/+1
2019-11-10Fix spelling errors in code commentsElijah Newren1-1/+1
2019-05-05*.[ch]: manually align parameter listsDenton Liu1-1/+1
2019-05-05*.[ch]: remove extern from function declarations using spatchDenton Liu1-5/+5
2018-11-05xdiff-interface: drop parse_hunk_header()Jeff King1-3/+0
2018-11-05diff: avoid generating unused hunk header linesJeff King1-0/+8
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King1-2/+8
2017-10-26xdiff-interface: export comparing and hashing stringsStefan Beller1-0/+16
2016-09-07Convert read_mmblob to take struct object_id.brian m. carlson1-1/+2
2015-09-28xdiff: reject files larger than ~1GBJeff King1-0/+7
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe1-4/+0
2010-05-04Merge branch 'maint-1.7.0' into maintJunio C Hamano1-2/+1
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe1-2/+1
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov1-0/+1
2009-07-01userdiff: add xdiff_clear_find_func()René Scharfe1-0/+1
2008-10-25add xdi_diff_hunks() for callers that only need hunk lengthsRené Scharfe1-0/+4
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce1-1/+1
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce1-0/+2
2008-09-18Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano1-1/+1
2008-09-18diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey1-1/+1
2008-08-30merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano1-0/+2
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano1-9/+2
2008-08-13Use strbuf for struct xdiff_emit_state's remainderBrian Downing1-2/+2
2008-08-13Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing1-1/+3
2007-12-13xdl_diff: identify call sites.Junio C Hamano1-0/+1
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano1-0/+2
2007-06-04Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin1-0/+1
2006-12-21move read_mmfile() into xdiff-interfaceJohannes Schindelin1-0/+1
2006-04-06Match ofs/cnt types in diff interface.Junio C Hamano1-2/+2
2006-04-05combine-diff: move the code to parse hunk-header into common library.Junio C Hamano1-0/+3
2006-04-05combine-diff: refactor built-in xdiff interface.Junio C Hamano1-0/+18
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 09:27:04 +0000