projects
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
[git.git]
/
git-merge.sh
2005-09-13
Fredrik Kuivinen
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
blob
|
commitdiff
2005-09-13
Junio C Hamano
Fix off-by-one error in git-merge
blob
|
commitdiff
|
diff to current
2005-09-11
Junio C Hamano
Add a new merge strategy by Fredrik Kuivinen.
blob
|
commitdiff
|
diff to current
2005-09-11
Junio C Hamano
Use Daniel's read-tree in the merge strategy 'resolve'.
blob
|
commitdiff
|
diff to current
2005-09-11
Junio C Hamano
Multi-backend merge driver.
blob
|
commitdiff
|
diff to current
projects / git.git / history