summaryrefslogtreecommitdiff
path: root/git-merge.sh
AgeCommit message (Expand)Author
2006-02-23checkout - eye candy.Junio C Hamano
2006-02-22Keep Porcelainish from failing by broken ident after making changes.Junio C Hamano
2006-02-12Only call git-rerere if $GIT_DIR/rr-cache exists.Junio C Hamano
2006-02-07git-rerere: reuse recorded resolve.Junio C Hamano
2006-02-04git-merge: Properly quote $merge_msg variable.Junio C Hamano
2006-01-28merge: seed the commit message with list of conflicted files.Junio C Hamano
2005-12-23merge --no-commit: tweak messageJunio C Hamano
2005-12-14Trivial usage string clean-upfreku045@student.liu.se
2005-12-14[PATCH] allow merging any committishJunio C Hamano
2005-12-03git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano
2005-11-24git-merge: make recursive the default strategyJunio C Hamano
2005-11-10Use 'merge-base --all' where applicable.Junio C Hamano
2005-11-03Add 'ours' merge strategy.Junio C Hamano
2005-11-03Add --no-commit to git-merge/git-pull.Junio C Hamano
2005-10-28Documentation changes to recursive option for git-diff-treeChris Shoemaker
2005-10-22Allow git-merge not to commit.Junio C Hamano
2005-10-03[PATCH] Enable and fix support for base less merges.Fredrik Kuivinen
2005-10-02Handle really trivial case inside git-merge.Junio C Hamano
2005-09-28Use git-update-ref in scripts.Junio C Hamano
2005-09-28Fastpath the normal case by not checking that index matches HEAD.Junio C Hamano
2005-09-27Give default merge message after failed automerge.Junio C Hamano
2005-09-27Fix overzealous cleanliness check in git-mergeJunio C Hamano
2005-09-25[PATCH] More descriptive messages for conflict cases in mergesFredrik Kuivinen
2005-09-13[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen
2005-09-13Fix off-by-one error in git-mergeJunio C Hamano
2005-09-11Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano
2005-09-11Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano
2005-09-11Multi-backend merge driver.Junio C Hamano