| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Add 'ours' merge strategy. | Junio C Hamano | 2005-11-03 | 1 | -1/+1 |
| * | Add --no-commit to git-merge/git-pull. | Junio C Hamano | 2005-11-03 | 1 | -10/+18 |
| * | Documentation changes to recursive option for git-diff-tree | Chris Shoemaker | 2005-10-28 | 1 | -1/+1 |
| * | Allow git-merge not to commit. | Junio C Hamano | 2005-10-22 | 1 | -11/+17 |
| * | [PATCH] Enable and fix support for base less merges. | Fredrik Kuivinen | 2005-10-03 | 1 | -2/+2 |
| * | Handle really trivial case inside git-merge. | Junio C Hamano | 2005-10-02 | 1 | -1/+21 |
| * | Use git-update-ref in scripts. | Junio C Hamano | 2005-09-28 | 1 | -4/+5 |
| * | Fastpath the normal case by not checking that index matches HEAD. | Junio C Hamano | 2005-09-28 | 1 | -7/+4 |
| * | 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 |
