index
:
git.git
main
maint
master
next
seen
todo
The core git plumbing
Junio C. Hamano
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
merge-ll.c
Age
Commit message (
Expand
)
Author
Files
Lines
23 hours
global: convert intentionally-leaking config strings to consts
Patrick Steinhardt
1
-3
/
+8
3 days
config: clarify memory ownership in `git_config_string()`
Patrick Steinhardt
1
-3
/
+3
2024-04-01
Merge branch 'pw/checkout-conflict-errorfix'
Junio C Hamano
1
-2
/
+4
2024-03-14
merge options: add a conflict style member
Phillip Wood
1
-1
/
+3
2024-03-14
merge-ll: introduce LL_MERGE_OPTIONS_INIT
Phillip Wood
1
-1
/
+1
2024-02-26
Merge branch 'rs/use-xstrncmpz'
Junio C Hamano
1
-1
/
+1
2024-02-12
use xstrncmpz()
René Scharfe
1
-1
/
+1
2024-01-24
merge-ll: expose revision names to custom drivers
Antonin Delpeuch
1
-3
/
+14
2023-12-09
config: use config_error_nonbool() instead of custom messages
Jeff King
1
-1
/
+1
2023-07-17
Merge branch 'cw/compat-util-header-cleanup'
Junio C Hamano
1
-1
/
+0
2023-07-06
Merge branch 'gc/config-context'
Junio C Hamano
1
-0
/
+1
2023-07-06
Merge branch 'rs/strbuf-expand-step'
Junio C Hamano
1
-15
/
+18
2023-07-05
treewide: remove unnecessary includes for wrapper.h
Calvin Wan
1
-1
/
+0
2023-06-29
Merge branch 'jc/abort-ll-merge-with-a-signal'
Junio C Hamano
1
-1
/
+8
2023-06-21
merge-ll: rename from ll-merge
Elijah Newren
1
-0
/
+432