summaryrefslogtreecommitdiffstats
path: root/xdiff-interface.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt2024-12-061-0/+1
* global: introduce `USE_THE_REPOSITORY_VARIABLE` macroPatrick Steinhardt2024-06-141-0/+2
* xdiff-interface: refactor parsing of merge.conflictstylePhillip Wood2024-03-141-11/+18
* Merge branch 'en/header-cleanup'Junio C Hamano2024-01-081-2/+0
|\
| * treewide: remove unnecessary includes in source filesElijah Newren2023-12-261-2/+0
* | config: use config_error_nonbool() instead of custom messagesJeff King2023-12-091-1/+1
* | git_xmerge_config(): prefer error() to die()Jeff King2023-12-091-3/+4
|/
* Merge branch 'gc/config-context'Junio C Hamano2023-07-061-2/+3
|\
| * config: add ctx arg to config_fn_tGlen Choo2023-06-281-2/+3
* | object-store-ll.h: split this header out of object-store.hElijah Newren2023-06-211-1/+2
|/
* Merge branch 'en/header-split-cleanup'Junio C Hamano2023-04-061-1/+1
|\
| * treewide: remove unnecessary cache.h inclusion from several sourcesElijah Newren2023-03-211-1/+1
* | Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano2023-04-061-1/+1
|\ \ | |/ |/|
| * cocci: apply the "object-store.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-1/+1
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-241-0/+1
|/
* Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano2022-05-021-1/+1
|\
| * tree-wide: apply equals-null.cocciJunio C Hamano2022-05-021-1/+1
* | xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood2021-12-011-0/+2
|/
* Merge branch 'ab/pickaxe-pcre2'Junio C Hamano2021-07-141-11/+16
|\
| * xdiff-interface: replace discard_hunk_line() with a flagÆvar Arnfjörð Bjarmason2021-05-111-6/+0
| * xdiff-interface: allow early return from xdiff_emit_line_fnÆvar Arnfjörð Bjarmason2021-05-111-4/+14
| * xdiff-interface: prepare for allowing early returnÆvar Arnfjörð Bjarmason2021-05-111-1/+2
* | hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-1/+1
|/
* xdiff: avoid computing non-zero offset from NULL pointerJeff King2020-01-291-2/+6
* avoid computing zero offsets from NULL pointerJeff King2020-01-291-2/+2
* completion: add more parameter value completionNguyễn Thái Ngọc Duy2019-02-201-0/+4
* Merge branch 'jk/xdiff-interface'Junio C Hamano2018-11-131-45/+31
|\
| * xdiff-interface: drop parse_hunk_header()Jeff King2018-11-051-45/+0
| * diff: use hunk callback for word-diffJeff King2018-11-051-0/+3
| * diff: avoid generating unused hunk header linesJeff King2018-11-051-0/+6
| * xdiff-interface: provide a separate consume callback for hunksJeff King2018-11-021-4/+26
| * xdiff: provide a separate emit callback for hunksJeff King2018-11-021-1/+1
* | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-1/+1
|/
* object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-1/+1
* xdiff-interface: export comparing and hashing stringsStefan Beller2017-10-261-0/+12
* Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\
| * config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | print errno when reporting a system call errorNguyễn Thái Ngọc Duy2017-05-261-2/+2
|/
* Merge branch 'js/regexec-buf'Junio C Hamano2016-09-271-9/+4
|\
| * regex: use regexec_buf()Johannes Schindelin2016-09-211-9/+4
* | Convert read_mmblob to take struct object_id.brian m. carlson2016-09-071-4/+4
* | xdiff: don't trim common tail with -WRené Scharfe2016-05-311-6/+4
|/
* convert trivial cases to ALLOC_ARRAYJeff King2016-02-221-1/+1
* xdiff: reject files larger than ~1GBJeff King2015-09-281-0/+3
* xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe2012-05-091-44/+0
* add, merge, diff: do not use strcasecmp to compare config variable namesJonathan Nieder2011-05-151-1/+1
* Merge branch 'rs/maint-diff-fd-leak' into maintJunio C Hamano2010-12-261-1/+3
|\
| * close file on error in read_mmfile()René Scharfe2010-12-261-1/+3
* | xdiff-interface.c: always trim trailing space from xfuncname matchesBrandon Casey2010-09-101-3/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-18 06:17:22 +0100