Hi, I am using git 1.5.3.4 and just did the following (v1 and v2 are branches; v1 is a parent of v2): git checkout v1 git merge --no-commit v2 It simply fast-forwarded AND committed even though I explicitly told it not to. What gives? Kind regards, Vegard Nossum - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
