summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
AgeCommit message (Expand)AuthorFilesLines
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Libravatar Phillip Wood1-0/+2
2021-07-13Merge branch 'ab/pickaxe-pcre2'Libravatar Junio C Hamano1-11/+16
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagLibravatar Ævar Arnfjörð Bjarmason1-6/+0
2021-05-11xdiff-interface: allow early return from xdiff_emit_line_fnLibravatar Ævar Arnfjörð Bjarmason1-4/+14
2021-05-11xdiff-interface: prepare for allowing early returnLibravatar Ævar Arnfjörð Bjarmason1-1/+2
2021-04-27hash: provide per-algorithm null OIDsLibravatar brian m. carlson1-1/+1
2020-01-28xdiff: avoid computing non-zero offset from NULL pointerLibravatar Jeff King1-2/+6
2020-01-28avoid computing zero offsets from NULL pointerLibravatar Jeff King1-2/+2
2019-02-20completion: add more parameter value completionLibravatar Nguyễn Thái Ngọc Duy1-0/+4
2018-11-13Merge branch 'jk/xdiff-interface'Libravatar Junio C Hamano1-45/+31
2018-11-05xdiff-interface: drop parse_hunk_header()Libravatar Jeff King1-45/+0
2018-11-05diff: use hunk callback for word-diffLibravatar Jeff King1-0/+3
2018-11-05diff: avoid generating unused hunk header linesLibravatar Jeff King1-0/+6
2018-11-02xdiff-interface: provide a separate consume callback for hunksLibravatar Jeff King1-4/+26
2018-11-02xdiff: provide a separate emit callback for hunksLibravatar Jeff King1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Libravatar Jeff King1-1/+1
2018-05-16object-store: move object access functions to object-store.hLibravatar Stefan Beller1-0/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idLibravatar brian m. carlson1-1/+1
2017-10-26xdiff-interface: export comparing and hashing stringsLibravatar Stefan Beller1-0/+12
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-05-26print errno when reporting a system call errorLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2016-09-26Merge branch 'js/regexec-buf'Libravatar Junio C Hamano1-9/+4
2016-09-21regex: use regexec_buf()Libravatar Johannes Schindelin1-9/+4
2016-09-07Convert read_mmblob to take struct object_id.Libravatar brian m. carlson1-4/+4
2016-05-31xdiff: don't trim common tail with -WLibravatar René Scharfe1-6/+4
2016-02-22convert trivial cases to ALLOC_ARRAYLibravatar Jeff King1-1/+1
2015-09-28xdiff: reject files larger than ~1GBLibravatar Jeff King1-0/+3
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()Libravatar René Scharfe1-44/+0
2011-05-14add, merge, diff: do not use strcasecmp to compare config variable namesLibravatar Jonathan Nieder1-1/+1
2010-12-26Merge branch 'rs/maint-diff-fd-leak' into maintLibravatar Junio C Hamano1-1/+3
2010-12-26close file on error in read_mmfile()Libravatar René Scharfe1-1/+3
2010-09-09xdiff-interface.c: always trim trailing space from xfuncname matchesLibravatar Brandon Casey1-3/+2
2010-05-04Merge branch 'maint-1.7.0' into maintLibravatar Junio C Hamano1-5/+6
2010-05-04remove ecb parameter from xdi_diff_outf()Libravatar René Scharfe1-5/+6
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveLibravatar Michael Lukashov1-0/+17
2009-07-01userdiff: add xdiff_clear_find_func()Libravatar René Scharfe1-0/+15
2009-03-07Remove unused function scope local variablesLibravatar Benjamin Kramer1-2/+1
2008-11-26xdiff-interface.c: remove 10 duplicated linesLibravatar Jim Meyering1-11/+0
2008-11-08Merge branch 'rs/blame'Libravatar Junio C Hamano1-1/+48
2008-10-25add xdi_diff_hunks() for callers that only need hunk lengthsLibravatar René Scharfe1-1/+48
2008-10-17Merge branch 'maint'Libravatar Junio C Hamano1-0/+10
2008-10-16xdiff-interface.c: strip newline (and cr) from line before pattern matchingLibravatar Brandon Casey1-1/+11
2008-10-02xdiff-interface.c: strip newline (and cr) from line before pattern matchingLibravatar Brandon Casey1-1/+11
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Libravatar Shawn O. Pearce1-9/+12
2008-09-29Merge branch 'jc/better-conflict-resolution'Libravatar Shawn O. Pearce1-0/+20
2008-09-20diff: fix "multiple regexp" semantics to find hunk header commentLibravatar Junio C Hamano1-7/+10
2008-09-18Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixLibravatar Junio C Hamano1-2/+2
2008-09-18diff.c: associate a flag with each pattern and use it for compiling regexLibravatar Brandon Casey1-2/+2
2008-08-30merge.conflictstyle: choose between "merge" and "diff3 -m" stylesLibravatar Junio C Hamano1-0/+20
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 17:48:04 +0000