Fix git-am --skip
[gitweb.git] / git-merge.sh
2005-12-14 Merge branch 'hold/am'
2005-12-14 Merge branch 'fk/usage'
2005-12-14 Trivial usage string clean-up
2005-12-14 [PATCH] allow merging any committish
2005-12-07 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-03 git-merge: Exit with code 2 if no strategy was able...
2005-11-29 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-28 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-25 git-sh-setup: die if outside git repository.
2005-11-24 git-merge: make recursive the default strategy
2005-11-22 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-10 Use 'merge-base --all' where applicable.
2005-11-03 Add 'ours' merge strategy.
2005-11-03 Add --no-commit to git-merge/git-pull.
2005-10-28 Documentation changes to recursive option for git-diff...
2005-10-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-23 Merge branch 'fixes'
2005-10-22 Allow git-merge not to commit.
2005-10-03 Merge with master.kernel.org:/pub/scm/git/git.git
2005-10-03 Merge branch 'fixes'
2005-10-03 Merge with master.kernel.org:/pub/scm/git/git.git
2005-10-03 [PATCH] Enable and fix support for base less merges.
2005-10-02 Handle really trivial case inside git-merge.
2005-09-29 Merge ... www.kernel.org/pub/scm/git/git.git
2005-09-28 Use git-update-ref in scripts.
2005-09-28 Fastpath the normal case by not checking that index...
2005-09-27 Merge ... git+ssh://kernel.org/pub/scm/git/git.git
2005-09-27 Merge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-27 Give default merge message after failed automerge.
2005-09-27 Fix overzealous cleanliness check in git-merge
2005-09-25 [PATCH] More descriptive messages for conflict cases...
2005-09-14 Merge branch 'master' of .
2005-09-13 [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
2005-09-13 Fix off-by-one error in git-merge
2005-09-11 Add a new merge strategy by Fredrik Kuivinen.
2005-09-11 Use Daniel's read-tree in the merge strategy 'resolve'.
2005-09-11 Multi-backend merge driver.