summaryrefslogtreecommitdiffstats
path: root/xdiff-interface.h (follow)
Commit message (Expand)AuthorAgeFilesLines
* hash-ll: merge with "hash.h"Patrick Steinhardt2024-06-141-1/+1
* xdiff-interface: refactor parsing of merge.conflictstylePhillip Wood2024-03-141-0/+1
* config: add ctx arg to config_fn_tGlen Choo2023-06-281-1/+3
* hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren2023-04-241-1/+1
* treewide: remove unnecessary cache.h includesElijah Newren2023-02-241-1/+1
* xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason2021-05-111-8/+0
* pickaxe -G: terminate early on matching linesÆvar Arnfjörð Bjarmason2021-05-111-0/+4
* xdiff-interface: allow early return from xdiff_emit_line_fnÆvar Arnfjörð Bjarmason2021-05-111-0/+17
* xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason2021-05-111-1/+1
* Fix spelling errors in code commentsElijah Newren2019-11-101-1/+1
* *.[ch]: manually align parameter listsDenton Liu2019-05-051-1/+1
* *.[ch]: remove extern from function declarations using spatchDenton Liu2019-05-051-5/+5
* xdiff-interface: drop parse_hunk_header()Jeff King2018-11-051-3/+0
* diff: avoid generating unused hunk header linesJeff King2018-11-051-0/+8
* xdiff-interface: provide a separate consume callback for hunksJeff King2018-11-021-2/+8
* xdiff-interface: export comparing and hashing stringsStefan Beller2017-10-261-0/+16
* Convert read_mmblob to take struct object_id.brian m. carlson2016-09-071-1/+2
* xdiff: reject files larger than ~1GBJeff King2015-09-281-0/+7
* xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe2012-05-091-4/+0
* Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-051-2/+1
|\
| * remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-051-2/+1
* | refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov2010-02-181-0/+1
|/
* userdiff: add xdiff_clear_find_func()René Scharfe2009-07-021-0/+1
* add xdi_diff_hunks() for callers that only need hunk lengthsRené Scharfe2008-10-251-0/+4
* Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-291-1/+1
|\
| * Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-191-1/+1
| |\
| | * diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-191-1/+1
* | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-291-0/+2
|\ \ \ | |/ / |/| |
| * | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-311-0/+2
| |/
* | xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano2008-08-141-9/+2
* | Use strbuf for struct xdiff_emit_state's remainderBrian Downing2008-08-141-2/+2
* | Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing2008-08-141-1/+3
|/
* xdl_diff: identify call sites.Junio C Hamano2007-12-141-0/+1
* Per-path attribute based hunk header selection.Junio C Hamano2007-07-061-0/+2
* Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin2007-06-051-0/+1
* move read_mmfile() into xdiff-interfaceJohannes Schindelin2006-12-221-0/+1
* Match ofs/cnt types in diff interface.Junio C Hamano2006-04-071-2/+2
* combine-diff: move the code to parse hunk-header into common library.Junio C Hamano2006-04-051-0/+3
* combine-diff: refactor built-in xdiff interface.Junio C Hamano2006-04-051-0/+18
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 13:20:49 +0100