aboutsummaryrefslogtreecommitdiff
path: root/git-merge.sh
Commit message (Expand)AuthorAge
* Use 'merge-base --all' where applicable.Junio C Hamano2005-11-09
* Add 'ours' merge strategy.Junio C Hamano2005-11-03
* Add --no-commit to git-merge/git-pull.Junio C Hamano2005-11-03
* Documentation changes to recursive option for git-diff-treeChris Shoemaker2005-10-28
* Allow git-merge not to commit.Junio C Hamano2005-10-22
* [PATCH] Enable and fix support for base less merges.Fredrik Kuivinen2005-10-03
* Handle really trivial case inside git-merge.Junio C Hamano2005-10-02
* Use git-update-ref in scripts.Junio C Hamano2005-09-28
* Fastpath the normal case by not checking that index matches HEAD.Junio C Hamano2005-09-28
* Give default merge message after failed automerge.Junio C Hamano2005-09-26
* Fix overzealous cleanliness check in git-mergeJunio C Hamano2005-09-26
* [PATCH] More descriptive messages for conflict cases in mergesFredrik Kuivinen2005-09-25
* [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen2005-09-13
* Fix off-by-one error in git-mergeJunio C Hamano2005-09-12
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-10
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-10
* Multi-backend merge driver.Junio C Hamano2005-09-10
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-16 05:00:27 +0000