| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Give default merge message after failed automerge. | Junio C Hamano | 2005-09-26 | 1 | -4/+10 |
| * | Fix overzealous cleanliness check in git-merge | Junio C Hamano | 2005-09-26 | 1 | -18/+50 |
| * | [PATCH] More descriptive messages for conflict cases in merges | Fredrik Kuivinen | 2005-09-25 | 1 | -3/+4 |
| * | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | Fredrik Kuivinen | 2005-09-13 | 1 | -2/+2 |
| * | Fix off-by-one error in git-merge | Junio C Hamano | 2005-09-12 | 1 | -1/+1 |
| * | Add a new merge strategy by Fredrik Kuivinen. | Junio C Hamano | 2005-09-10 | 1 | -1/+1 |
| * | Use Daniel's read-tree in the merge strategy 'resolve'. | Junio C Hamano | 2005-09-10 | 1 | -3/+3 |
| * | Multi-backend merge driver. | Junio C Hamano | 2005-09-10 | 1 | -0/+212 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/git-merge.sh