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-ort.h
Age
Commit message (
Expand
)
Author
Files
Lines
2023-04-24
hash-ll.h: split out of hash.h to remove dependency on repository.h
Elijah Newren
1
-1
/
+1
2022-06-22
merge-ort: optionally produce machine-readable output
Elijah Newren
1
-0
/
+1
2022-06-22
merge-ort: make `path_messages` a strmap to a string_list
Johannes Schindelin
1
-1
/
+1
2022-06-22
merge-ort: store messages in a list, not in a single strbuf
Johannes Schindelin
1
-1
/
+1
2022-06-22
merge-ort: provide a merge_get_conflicted_files() helper function
Elijah Newren
1
-0
/
+21
2022-06-22
merge-ort: split out a separate display_update_messages() function
Elijah Newren
1
-0
/
+8
2022-02-02
show, log: include conflict/warning messages in --remerge-diff headers
Elijah Newren
1
-0
/
+10
2021-05-20
merge-ort: avoid accidental API mis-use
Elijah Newren
1
-0
/
+2
2020-12-16
merge-ort: implement merge_incore_recursive()
Elijah Newren
1
-0
/
+10
2020-12-13
merge-ort: add an err() function similar to one from merge-recursive
Elijah Newren
1
-1
/
+8
2020-10-26
merge-ort: barebones API of new merge strategy with empty implementation
Elijah Newren
1
-0
/
+58