Documentation: talk about guts of merge in tutorial.
[git] / git-merge.sh
2005-11-03  Junio C HamanoAdd 'ours' merge strategy.
2005-11-03  Junio C HamanoAdd --no-commit to git-merge/git-pull.
2005-10-28  Chris ShoemakerDocumentation changes to recursive option for git-diff...
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-23  Junio C HamanoMerge branch 'fixes'
2005-10-22  Junio C HamanoAllow git-merge not to commit.
2005-10-03  Peter AnvinMerge with master.kernel.org:/pub/scm/git/git.git
2005-10-03  Junio C HamanoMerge branch 'fixes'
2005-10-03  Peter AnvinMerge with master.kernel.org:/pub/scm/git/git.git
2005-10-03  Fredrik Kuivinen[PATCH] Enable and fix support for base less merges.
2005-10-02  Junio C HamanoHandle really trivial case inside git-merge.
2005-09-29  Peter AnvinMerge ... www.kernel.org/pub/scm/git/git.git
2005-09-28  Junio C HamanoUse git-update-ref in scripts.
2005-09-28  Junio C HamanoFastpath the normal case by not checking that index...
2005-09-27  H. Peter AnvinMerge ... git+ssh://kernel.org/pub/scm/git/git.git
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-27  Junio C HamanoGive default merge message after failed automerge.
2005-09-27  Junio C HamanoFix overzealous cleanliness check in git-merge
2005-09-25  Fredrik Kuivinen[PATCH] More descriptive messages for conflict cases...
2005-09-14  Junio C HamanoMerge branch 'master' of .
2005-09-13  Fredrik Kuivinen[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
2005-09-13  Junio C HamanoFix off-by-one error in git-merge
2005-09-11  Junio C HamanoAdd a new merge strategy by Fredrik Kuivinen.
2005-09-11  Junio C HamanoUse Daniel's read-tree in the merge strategy 'resolve'.
2005-09-11  Junio C HamanoMulti-backend merge driver.