summaryrefslogtreecommitdiffstats
path: root/merge-ll.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt2024-12-061-0/+1
* merge: replace atoi() with strtol_i() for marker size validationUsman Akinyemi2024-10-241-2/+9
* Merge branch 'ak/typofix-2.46-maint'Junio C Hamano2024-09-251-1/+1
|\
| * merge-ll: fix a typoAndrew Kreimer2024-09-191-1/+1
* | global: prepare for hiding away repo-less config functionsPatrick Steinhardt2024-08-131-0/+2
|/
* global: convert intentionally-leaking config strings to constsPatrick Steinhardt2024-06-071-3/+8
* config: clarify memory ownership in `git_config_string()`Patrick Steinhardt2024-05-271-3/+3
* Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano2024-04-011-2/+4
|\
| * merge options: add a conflict style memberPhillip Wood2024-03-141-1/+3
| * merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood2024-03-141-1/+1
* | Merge branch 'rs/use-xstrncmpz'Junio C Hamano2024-02-271-1/+1
|\ \ | |/ |/|
| * use xstrncmpz()René Scharfe2024-02-121-1/+1
* | merge-ll: expose revision names to custom driversAntonin Delpeuch2024-01-241-3/+14
|/
* config: use config_error_nonbool() instead of custom messagesJeff King2023-12-091-1/+1
* Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano2023-07-171-1/+0
|\
| * treewide: remove unnecessary includes for wrapper.hCalvin Wan2023-07-051-1/+0
* | Merge branch 'gc/config-context'Junio C Hamano2023-07-061-0/+1
* | Merge branch 'rs/strbuf-expand-step'Junio C Hamano2023-07-061-15/+18
|/
* Merge branch 'jc/abort-ll-merge-with-a-signal'Junio C Hamano2023-06-301-1/+8
* merge-ll: rename from ll-mergeElijah Newren2023-06-211-0/+432