| Age | Commit message (Expand) | Author |
|---|---|---|
| 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 |
Welcome to mirror list, hosted at ThFree Co, Russian Federation.
 |
index : git.kernel.org/pub/scm/git/git.git | |
| Unnamed repository; edit this file 'description' to name the repository. | root |
| summaryrefslogtreecommitdiff |
path: root/git-merge.sh