aboutsummaryrefslogtreecommitdiffstats
path: root/merge-ll.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-1/+1
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+1
2024-10-24merge: replace atoi() with strtol_i() for marker size validationUsman Akinyemi1-2/+9
2024-09-25Merge branch 'ak/typofix-2.46-maint'Junio C Hamano1-1/+1
2024-09-19merge-ll: fix a typoAndrew Kreimer1-1/+1
2024-08-13global: prepare for hiding away repo-less config functionsPatrick Steinhardt1-0/+2
2024-06-07global: convert intentionally-leaking config strings to constsPatrick Steinhardt1-3/+8
2024-05-27config: clarify memory ownership in `git_config_string()`Patrick Steinhardt1-3/+3
2024-04-01Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano1-2/+4
2024-03-14merge options: add a conflict style memberPhillip Wood1-1/+3
2024-03-14merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood1-1/+1
2024-02-26Merge branch 'rs/use-xstrncmpz'Junio C Hamano1-1/+1
2024-02-12use xstrncmpz()René Scharfe1-1/+1
2024-01-24merge-ll: expose revision names to custom driversAntonin Delpeuch1-3/+14
2023-12-09config: use config_error_nonbool() instead of custom messagesJeff King1-1/+1
2023-07-17Merge branch 'cw/compat-util-header-cleanup'Junio C Hamano1-1/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-0/+1
2023-07-06Merge branch 'rs/strbuf-expand-step'Junio C Hamano1-15/+18
2023-07-05treewide: remove unnecessary includes for wrapper.hCalvin Wan1-1/+0
2023-06-29Merge branch 'jc/abort-ll-merge-with-a-signal'Junio C Hamano1-1/+8
2023-06-21merge-ll: rename from ll-mergeElijah Newren1-0/+432
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-30 19:25:57 +0000