Age | Commit message (Expand) | Author | Files | Lines |
2019-11-18 | merge: move doc to ll-merge.h | Heba Waly | 1 | -1/+72 |
2019-09-03 | am: reload .gitattributes after patching it | brian m. carlson | 1 | -0/+1 |
2019-01-04 | Merge branch 'en/merge-path-collision' | Junio C Hamano | 1 | -0/+1 |
2018-11-08 | merge-recursive: increase marker length with depth of recursion | Elijah Newren | 1 | -0/+1 |
2018-09-21 | ll-merge.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 1 | -1/+4 |
2018-08-15 | Add missing includes and forward declarations | Elijah Newren | 1 | -0/+2 |
2010-08-26 | merge-recursive --patience | Justin Frankel | 1 | -0/+1 |
2010-08-26 | ll-merge: replace flag argument with options struct | Jonathan Nieder | 1 | -15/+6 |
2010-08-06 | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 1 | -0/+1 |
2010-08-06 | ll-merge: make flag easier to populate | Jonathan Nieder | 1 | -0/+14 |
2010-03-20 | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 1 | -1/+1 |
2010-01-20 | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 1 | -0/+2 |
2010-01-17 | git merge -X<option> | Avery Pennarun | 1 | -1/+1 |
2010-01-17 | rerere: honor conflict-marker-size attribute | Junio C Hamano | 1 | -0/+2 |
2008-02-18 | merge-recursive: split low-level merge functions out. | Junio C Hamano | 1 | -0/+15 |