summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
AgeCommit message (Expand)Author
14 daysxdiff-interface: refactor parsing of merge.conflictstylePhillip Wood
2024-01-08Merge branch 'en/header-cleanup'Junio C Hamano
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren
2023-12-08config: use config_error_nonbool() instead of custom messagesJeff King
2023-12-08git_xmerge_config(): prefer error() to die()Jeff King
2023-07-06Merge branch 'gc/config-context'Junio C Hamano
2023-06-28config: add ctx arg to config_fn_tGlen Choo
2023-06-21object-store-ll.h: split this header out of object-store.hElijah Newren
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano
2023-03-28cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason
2023-03-21treewide: remove unnecessary cache.h inclusion from several sourcesElijah Newren
2023-02-24cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren
2022-05-02Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano
2022-05-02tree-wide: apply equals-null.cocciJunio C Hamano
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood
2021-07-13Merge branch 'ab/pickaxe-pcre2'Junio C Hamano
2021-05-11xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason
2021-05-11xdiff-interface: allow early return from xdiff_emit_line_fnÆvar Arnfjörð Bjarmason
2021-05-11xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson
2020-01-29xdiff: avoid computing non-zero offset from NULL pointerJeff King
2020-01-29avoid computing zero offsets from NULL pointerJeff King
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano
2018-11-05xdiff-interface: drop parse_hunk_header()Jeff King
2018-11-05diff: use hunk callback for word-diffJeff King
2018-11-05diff: avoid generating unused hunk header linesJeff King
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King
2018-11-02xdiff: provide a separate emit callback for hunksJeff King
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King
2018-05-16object-store: move object access functions to object-store.hStefan Beller
2018-03-14sha1_file: convert read_sha1_file to struct object_idbrian m. carlson
2017-10-26xdiff-interface: export comparing and hashing stringsStefan Beller
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-05-26print errno when reporting a system call errorNguyễn Thái Ngọc Duy
2016-09-26Merge branch 'js/regexec-buf'Junio C Hamano
2016-09-21regex: use regexec_buf()Johannes Schindelin
2016-09-07Convert read_mmblob to take struct object_id.brian m. carlson
2016-05-31xdiff: don't trim common tail with -WRené Scharfe
2016-02-22convert trivial cases to ALLOC_ARRAYJeff King
2015-09-28xdiff: reject files larger than ~1GBJeff King
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe
2011-05-15add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder
2010-12-26Merge branch 'rs/maint-diff-fd-leak' into maintJunio C Hamano
2010-12-26close file on error in read_mmfile()René Scharfe
2010-09-10xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey
2010-05-04Merge branch 'maint-1.7.0' into maintJunio C Hamano
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe