| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | git-merge-recursive: Trivial RE fixes. | Junio C Hamano | 2005-09-13 | 1 | -2/+2 |
| * | [PATCH] Use a temporary index file when we merge the common ancestors. | Fredrik Kuivinen | 2005-09-13 | 1 | -5/+18 |
| * | [PATCH] Adjust git-merge-recursive.py for the new tool names. | Fredrik Kuivinen | 2005-09-13 | 1 | -4/+4 |
| * | [PATCH] Don't output 'Automatic merge failed, ...' | Fredrik Kuivinen | 2005-09-13 | 1 | -1/+0 |
| * | [PATCH] Be more like the 'resolve' strategy. | Fredrik Kuivinen | 2005-09-13 | 1 | -35/+33 |
| * | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | Fredrik Kuivinen | 2005-09-13 | 1 | -0/+429 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/git-merge-recursive.py