| Commit message (Expand) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | Add a new merge strategy by Fredrik Kuivinen. | Junio C Hamano | 2005-09-10 | |
| * | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | 2005-09-10 | |
| * | Multi-backend merge driver. | Junio C Hamano | 2005-09-10 | |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/git-merge.sh