| Commit message (Expand) | Author | Age |
|---|
| * | merge-recursive: Make use of provided bases | Fredrik Kuivinen | 2006-02-02 |
| * | merge-recursive: Improve the error message printed when merge(1) isn't found. | Fredrik Kuivinen | 2006-01-29 |
| * | merge-recursive: conflicting rename case. | Junio C Hamano | 2005-12-21 |
| * | merge-recursive: cleanup setIndexStages | Junio C Hamano | 2005-12-11 |
| * | merge-recursive: leave unmerged entries in the index. | Junio C Hamano | 2005-12-11 |
| * | merge-recursive: adjust git-ls-tree use for the latest. | Junio C Hamano | 2005-12-01 |
| * | merge-recursive: match the unmerged index entry behaviour with merge-resolve | Junio C Hamano | 2005-11-30 |
| * | merge-recursive: Replace 'except:' | Fredrik Kuivinen | 2005-11-20 |
| * | merge-recursive::removeFile: remove empty directories | Junio C Hamano | 2005-11-19 |
| * | Give python a chance to find "backported" modules | Johannes Schindelin | 2005-11-15 |
| * | merge-recursive: Use '~' instead of '_' to separate file names from branch names | Fredrik Kuivinen | 2005-11-11 |
| * | merge-recursive: Add copyright notice | Fredrik Kuivinen | 2005-11-11 |
| * | merge-recursive: Indent the output properly | Fredrik Kuivinen | 2005-11-11 |
| * | merge-recursive: Fix support for branch names containing slashes | Fredrik Kuivinen | 2005-11-09 |
| * | merge-recursive: Fix limited output of rename messages | Fredrik Kuivinen | 2005-11-09 |
| * | merge-recursive: Only print relevant rename messages | Fredrik Kuivinen | 2005-11-07 |
| * | Deal with $(bindir) and friends with whitespaces. | Junio C Hamano | 2005-10-10 |
| * | [PATCH] Teach the recursive merge strategy about renames. | Fredrik Kuivinen | 2005-10-02 |
| * | [PATCH] recursive-merge: Don't print a stack trace when read-tree fails. | Fredrik Kuivinen | 2005-09-25 |
| * | git-merge-recursive: Trivial RE fixes. | Junio C Hamano | 2005-09-13 |
| * | [PATCH] Use a temporary index file when we merge the common ancestors. | Fredrik Kuivinen | 2005-09-13 |
| * | [PATCH] Adjust git-merge-recursive.py for the new tool names. | Fredrik Kuivinen | 2005-09-13 |
| * | [PATCH] Don't output 'Automatic merge failed, ...' | Fredrik Kuivinen | 2005-09-13 |
| * | [PATCH] Be more like the 'resolve' strategy. | Fredrik Kuivinen | 2005-09-13 |
| * | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | Fredrik Kuivinen | 2005-09-13 |
