Merge fixes up to GIT 1.1.5
[git/git.git] / git-merge.sh
2005-12-26 Junio C HamanoMerge branch 'jc/checkout'
2005-12-24 Junio C HamanoMerge fixes up to GIT 1.0.4
2005-12-24 Junio C HamanoGIT 1.0.4 v1.0.4
2005-12-23 Junio C Hamanomerge --no-commit: tweak message
2005-12-15 Junio C HamanoGIT 0.99.9n aka 1.0rc6 v0.99.9n v1.0rc6
2005-12-14 Junio C HamanoMerge branch 'hold/am'
2005-12-14 Junio C HamanoMerge branch 'fk/usage'
2005-12-14 freku045@student... Trivial usage string clean-up
2005-12-14 Junio C Hamano[PATCH] allow merging any committish
2005-12-07 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-04 Junio C HamanoGIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4
2005-12-03 Fredrik Kuivinengit-merge: Exit with code 2 if no strategy was able...
2005-11-29 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-26 Junio C HamanoGIT 0.99.9k v0.99.9k
2005-11-25 Junio C Hamanogit-sh-setup: die if outside git repository.
2005-11-24 Junio C Hamanogit-merge: make recursive the default strategy
2005-11-22 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-10 Junio C HamanoGIT 0.99.9g v0.99.9g
2005-11-10 Junio C HamanoUse 'merge-base --all' where applicable.
2005-11-07 Junio C HamanoGIT 0.99.9e v0.99.9e
2005-11-03 Junio C HamanoGIT 0.99.9c v0.99.9c
2005-11-03 Junio C HamanoAdd 'ours' merge strategy.
2005-11-03 Junio C HamanoAdd --no-commit to git-merge/git-pull.
2005-10-31 Junio C HamanoGIT 0.99.9a v0.99.9a
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.