summaryrefslogtreecommitdiffstats
path: root/git-merge.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Give default merge message after failed automerge.Junio C Hamano2005-09-271-4/+10
* Fix overzealous cleanliness check in git-mergeJunio C Hamano2005-09-271-18/+50
* [PATCH] More descriptive messages for conflict cases in mergesFredrik Kuivinen2005-09-261-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-131-1/+1
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-111-1/+1
* Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano2005-09-111-3/+3
* Multi-backend merge driver.Junio C Hamano2005-09-111-0/+212