summary refs log tree commit diff
path: root/ll-merge.h
AgeCommit message (Expand)AuthorFilesLines
2022-02-02ll-merge: make callers responsible for showing warningsElijah Newren1-1/+8
2019-11-18merge: move doc to ll-merge.hHeba Waly1-1/+72
2019-09-03am: reload .gitattributes after patching itbrian m. carlson1-0/+1
2019-01-04Merge branch 'en/merge-path-collision'Junio C Hamano1-0/+1
2018-11-08merge-recursive: increase marker length with depth of recursionElijah Newren1-0/+1
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+4
2018-08-15Add missing includes and forward declarationsElijah Newren1-0/+2
2010-08-26merge-recursive --patienceJustin Frankel1-0/+1
2010-08-26ll-merge: replace flag argument with options structJonathan Nieder1-15/+6
2010-08-06ll-merge: let caller decide whether to renormalizeJonathan Nieder1-0/+1
2010-08-06ll-merge: make flag easier to populateJonathan Nieder1-0/+14
2010-03-20ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder1-1/+1
2010-01-20Merge branch 'jc/conflict-marker-size'Junio C Hamano1-0/+2
2010-01-17git merge -X<option>Avery Pennarun1-1/+1
2010-01-17rerere: honor conflict-marker-size attributeJunio C Hamano1-0/+2
2008-02-18merge-recursive: split low-level merge functions out.Junio C Hamano1-0/+15
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-20 09:16:43 +0000