summaryrefslogtreecommitdiff
path: root/git-merge.sh
Commit message (Expand)AuthorAgeFilesLines
...
* Only call git-rerere if $GIT_DIR/rr-cache exists.Junio C Hamano2006-02-111-1/+4
* git-rerere: reuse recorded resolve.Junio C Hamano2006-02-061-0/+1
* git-merge: Properly quote $merge_msg variable.Junio C Hamano2006-02-031-1/+1
* merge: seed the commit message with list of conflicted files.Junio C Hamano2006-01-271-0/+8
* merge --no-commit: tweak messageJunio C Hamano2005-12-231-1/+10
* Trivial usage string clean-upfreku045@student.liu.se2005-12-141-4/+2
* [PATCH] allow merging any committishJunio C Hamano2005-12-131-1/+4
* git-merge: Exit with code 2 if no strategy was able to handle the merge.Fredrik Kuivinen2005-12-031-1/+2
* git-sh-setup: die if outside git repository.Junio C Hamano2005-11-251-1/+1
* git-merge: make recursive the default strategyJunio C Hamano2005-11-231-8/+12
* Use 'merge-base --all' where applicable.Junio C Hamano2005-11-091-2/+9
* Add 'ours' merge strategy.Junio C Hamano2005-11-031-1/+1
* Add --no-commit to git-merge/git-pull.Junio C Hamano2005-11-031-10/+18
* Documentation changes to recursive option for git-diff-treeChris Shoemaker2005-10-281-1/+1
* Allow git-merge not to commit.Junio C Hamano2005-10-221-11/+17
* [PATCH] Enable and fix support for base less merges.Fredrik Kuivinen2005-10-031-2/+2
* Handle really trivial case inside git-merge.Junio C Hamano2005-10-021-1/+21
* Use git-update-ref in scripts.Junio C Hamano2005-09-281-4/+5
* Fastpath the normal case by not checking that index matches HEAD.Junio C Hamano2005-09-281-7/+4
* Give default merge message after failed automerge.Junio C Hamano2005-09-261-4/+10
* Fix overzealous cleanliness check in git-mergeJunio C Hamano2005-09-261-18/+50
* [PATCH] More descriptive messages for conflict cases in mergesFredrik Kuivinen2005-09-251-3/+4
* [PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen2005-09-131-2/+2
* Fix off-by-one error in git-mergeJunio C Hamano2005-09-121-1/+1
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-101-1/+1
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-101-3/+3
* Multi-backend merge driver.Junio C Hamano2005-09-101-0/+212
View Lorry Controller Status