On Thu, 06 Oct 2011 11:25:34 +0000, Jacob Helwig wrote: > "git merge --no-ff --no-commit branch_foo && git commit" ? "git merge --no-ff branch_foo && git commit --amend" Andreas -- 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