projects / git.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
[PATCH] Make the test more shell generic and fix missing Solaris find option
[git.git] / git-merge.sh
2005-09-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff
2005-09-27 Junio C HamanoGive default merge message after failed automerge. blob | commitdiff
2005-09-27 Junio C HamanoFix overzealous cleanliness check in git-merge blob | commitdiff | diff to current
2005-09-25 Fredrik Kuivinen[PATCH] More descriptive messages for conflict cases... blob | commitdiff | diff to current
2005-09-14 Junio C HamanoMerge branch 'master' of . blob | commitdiff | diff to current
2005-09-13 Fredrik Kuivinen[PATCH] Rename the 'fredrik' merge strategy to 'recursive'. blob | commitdiff | diff to current
2005-09-13 Junio C HamanoFix off-by-one error in git-merge blob | commitdiff | diff to current
2005-09-11 Junio C HamanoAdd a new merge strategy by Fredrik Kuivinen. blob | commitdiff | diff to current
2005-09-11 Junio C HamanoUse Daniel's read-tree in the merge strategy 'resolve'. blob | commitdiff | diff to current
2005-09-11 Junio C HamanoMulti-backend merge driver. blob | commitdiff | diff to current
The core git plumbing