Age | Commit message (Expand) | Author |
---|---|---|
2005-09-27 | Fix overzealous cleanliness check in git-merge | Junio C Hamano |
2005-09-26 | [PATCH] More descriptive messages for conflict cases in merges | Fredrik Kuivinen |
2005-09-13 | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | Fredrik Kuivinen |
2005-09-13 | Fix off-by-one error in git-merge | Junio C Hamano |
2005-09-11 | Add a new merge strategy by Fredrik Kuivinen. | Junio C Hamano |
2005-09-11 | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano |
2005-09-11 | Multi-backend merge driver. | Junio C Hamano |