Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
ll-merge.h
Age
Commit message (
Expand
)
Author
2019-11-18
merge: move doc to ll-merge.h
Heba Waly
2019-09-04
am: reload .gitattributes after patching it
brian m. carlson
2019-01-05
Merge branch 'en/merge-path-collision'
Junio C Hamano
2018-11-08
merge-recursive: increase marker length with depth of recursion
Elijah Newren
2018-09-21
ll-merge.c: remove implicit dependency on the_index
Nguyễn Thái Ngọc Duy
2018-08-15
Add missing includes and forward declarations
Elijah Newren
2010-08-26
merge-recursive --patience
Justin Frankel
2010-08-26
ll-merge: replace flag argument with options struct
Jonathan Nieder
2010-08-06
ll-merge: let caller decide whether to renormalize
Jonathan Nieder
2010-08-06
ll-merge: make flag easier to populate
Jonathan Nieder
2010-03-21
ll_merge(): add ancestor label parameter for diff3-style output
Jonathan Nieder
2010-01-21
Merge branch 'jc/conflict-marker-size'
Junio C Hamano
2010-01-18
git merge -X<option>
Avery Pennarun
2010-01-17
rerere: honor conflict-marker-size attribute
Junio C Hamano
2008-02-18
merge-recursive: split low-level merge functions out.
Junio C Hamano