projects / git.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
git-fetch-pack: Implement client part of the multi_ack extension
[git.git] / git-merge.sh
2005-10-23 Junio C HamanoMerge branch 'fixes' blob | commitdiff
2005-10-22 Junio C HamanoAllow git-merge not to commit. blob | commitdiff
2005-10-03 Peter AnvinMerge with master.kernel.org:/pub/scm/git/git.git blob | commitdiff | diff to current
2005-10-03 Junio C HamanoMerge branch 'fixes' blob | commitdiff | diff to current
2005-10-03 Peter AnvinMerge with master.kernel.org:/pub/scm/git/git.git blob | commitdiff | diff to current
2005-10-03 Fredrik Kuivinen[PATCH] Enable and fix support for base less merges. blob | commitdiff | diff to current
2005-10-02 Junio C HamanoHandle really trivial case inside git-merge. blob | commitdiff | diff to current
2005-09-29 Peter AnvinMerge ... www.kernel.org/pub/scm/git/git.git blob | commitdiff | diff to current
2005-09-28 Junio C HamanoUse git-update-ref in scripts. blob | commitdiff | diff to current
2005-09-28 Junio C HamanoFastpath the normal case by not checking that index... blob | commitdiff | diff to current
2005-09-27 H. Peter AnvinMerge ... git+ssh://kernel.org/pub/scm/git/git.git blob | commitdiff | diff to current
2005-09-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk blob | commitdiff | diff to current
2005-09-27 Junio C HamanoGive default merge message after failed automerge. blob | commitdiff | diff to current
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