| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2005-10-02 | [PATCH] Teach the recursive merge strategy about renames. | Fredrik Kuivinen | 1 | -185/+601 |
| 2005-09-25 | [PATCH] recursive-merge: Don't print a stack trace when read-tree fails. | Fredrik Kuivinen | 1 | -3/+9 |
| 2005-09-13 | git-merge-recursive: Trivial RE fixes. | Junio C Hamano | 1 | -2/+2 |
| 2005-09-13 | [PATCH] Use a temporary index file when we merge the common ancestors. | Fredrik Kuivinen | 1 | -5/+18 |
| 2005-09-13 | [PATCH] Adjust git-merge-recursive.py for the new tool names. | Fredrik Kuivinen | 1 | -4/+4 |
| 2005-09-13 | [PATCH] Don't output 'Automatic merge failed, ...' | Fredrik Kuivinen | 1 | -1/+0 |
| 2005-09-13 | [PATCH] Be more like the 'resolve' strategy. | Fredrik Kuivinen | 1 | -35/+33 |
| 2005-09-13 | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | Fredrik Kuivinen | 1 | -0/+429 |
 |
index : git.git | |
| The core git plumbing | Junio C. Hamano |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/git-merge-recursive.py