> I tried that but I don't see that it's any different than a fast > forward in this scenario. Actually I don't see any difference between > it and a fast-forward. If you want to be given a chance to edit the result before the merge commit, you probably want 'git merge --no-commit'. -Brett -- 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
