summaryrefslogtreecommitdiffstats
path: root/xdiff-interface.c
AgeCommit message (Expand)AuthorLines
2025-11-18xdiff: use unambiguous types in xdl_hash_record()Ezekiel Newren-1/+1
2025-07-23config: move Git config parsing into "environment.c"Patrick Steinhardt-0/+1
2025-07-01odb: rename `repo_read_object_file()`Patrick Steinhardt-1/+1
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt-1/+1
2025-04-15object-store: merge "object-store-ll.h" and "object-store.h"Patrick Steinhardt-1/+1
2025-03-10hash: stop depending on `the_repository` in `null_oid()`Patrick Steinhardt-1/+1
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt-0/+1
2024-06-14global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt-0/+2
2024-03-14xdiff-interface: refactor parsing of merge.conflictstylePhillip Wood-11/+18
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano-2/+0
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren-2/+0
2023-12-09config: use config_error_nonbool() instead of custom messagesJeff King-1/+1
2023-12-09git_xmerge_config(): prefer error() to die()Jeff King-3/+4
2023-07-06Merge branch 'gc/config-context'Junio C Hamano-2/+3
2023-06-28config: add ctx arg to config_fn_tGlen Choo-2/+3
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren-1/+2
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano-1/+1
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano-1/+1
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason-1/+1
2023-03-21treewide: remove unnecessary cache.h inclusion from several sourcesElijah Newren-1/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren-0/+1
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano-1/+1
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano-1/+1
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood-0/+2
2021-07-13Merge branch 'ab/pickaxe-pcre2'Junio C Hamano-11/+16
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason-6/+0
2021-05-11xdiff-interface: allow early return from xdiff_emit_line_fnÆvar Arnfjörð Bjarmason-4/+14
2021-05-11xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason-1/+2
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson-1/+1
2020-01-28xdiff: avoid computing non-zero offset from NULL pointerJeff King-2/+6
2020-01-28avoid computing zero offsets from NULL pointerJeff King-2/+2
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy-0/+4
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano-45/+31
2018-11-05xdiff-interface: drop parse_hunk_header()Jeff King-45/+0
2018-11-05diff: use hunk callback for word-diffJeff King-0/+3
2018-11-05diff: avoid generating unused hunk header linesJeff King-0/+6
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King-4/+26
2018-11-02xdiff: provide a separate emit callback for hunksJeff King-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King-1/+1
2018-05-16object-store: move object access functions to object-store.hStefan Beller-0/+1
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson-1/+1
2017-10-26xdiff-interface: export comparing and hashing stringsStefan Beller-0/+12
2017-06-24Merge branch 'bw/config-h'Junio C Hamano-0/+1
2017-06-15config: don't include config.h by defaultBrandon Williams-0/+1
2017-05-26print errno when reporting a system call errorNguyễn Thái Ngọc Duy-2/+2
2016-09-26Merge branch 'js/regexec-buf'Junio C Hamano-9/+4
2016-09-21regex: use regexec_buf()Johannes Schindelin-9/+4
2016-09-07Convert read_mmblob to take struct object_id.brian m. carlson-4/+4
2016-05-31xdiff: don't trim common tail with -WRené Scharfe-6/+4
2016-02-22convert trivial cases to ALLOC_ARRAYJeff King-1/+1