Age | Commit message (Expand) | Author |
---|---|---|
2005-09-26 | [PATCH] recursive-merge: Don't print a stack trace when read-tree fails. | Fredrik Kuivinen |
2005-09-14 | git-merge-recursive: Trivial RE fixes. | Junio C Hamano |
2005-09-14 | [PATCH] Use a temporary index file when we merge the common ancestors. | Fredrik Kuivinen |
2005-09-14 | [PATCH] Adjust git-merge-recursive.py for the new tool names. | Fredrik Kuivinen |
2005-09-14 | [PATCH] Don't output 'Automatic merge failed, ...' | Fredrik Kuivinen |
2005-09-14 | [PATCH] Be more like the 'resolve' strategy. | Fredrik Kuivinen |
2005-09-13 | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | Fredrik Kuivinen |