Age | Commit message (Expand) | Author | Files | Lines |
2005-11-20 | merge-recursive: Replace 'except:' | Fredrik Kuivinen | 1 | -2/+2 |
2005-11-19 | merge-recursive::removeFile: remove empty directories | Junio C Hamano | 1 | -0/+4 |
2005-11-15 | Give python a chance to find "backported" modules | Johannes Schindelin | 1 | -2/+4 |
2005-11-11 | merge-recursive: Use '~' instead of '_' to separate file names from branch names | Fredrik Kuivinen | 1 | -2/+2 |
2005-11-11 | merge-recursive: Add copyright notice | Fredrik Kuivinen | 1 | -0/+3 |
2005-11-11 | merge-recursive: Indent the output properly | Fredrik Kuivinen | 1 | -61/+69 |
2005-11-09 | merge-recursive: Fix support for branch names containing slashes | Fredrik Kuivinen | 1 | -0/+1 |
2005-11-09 | merge-recursive: Fix limited output of rename messages | Fredrik Kuivinen | 1 | -8/+4 |
2005-11-07 | merge-recursive: Only print relevant rename messages | Fredrik Kuivinen | 1 | -7/+15 |
2005-10-10 | Deal with $(bindir) and friends with whitespaces. | Junio C Hamano | 1 | -1/+1 |
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 |