| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | Fredrik Kuivinen | 2005-09-13 |
| * | [PATCH] Make sure we die if we don't get enough arguments. | Fredrik Kuivinen | 2005-09-12 |
| * | [PATCH] Introduce a 'die' function. | Fredrik Kuivinen | 2005-09-12 |
| * | [PATCH] Exit with status code 2 if we get an exception. | Fredrik Kuivinen | 2005-09-12 |
| * | [PATCH] Fix assertion failure when merging common ancestors. | Fredrik Kuivinen | 2005-09-12 |
| * | Add a new merge strategy by Fredrik Kuivinen. | Junio C Hamano | 2005-09-10 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/git-merge-fredrik.py