| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Fastpath the normal case by not checking that index matches HEAD. | Junio C Hamano | 2005-09-28 |
| * | Give default merge message after failed automerge. | Junio C Hamano | 2005-09-26 |
| * | 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-25 |
| * | [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-12 |
| * | 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