Furthermore, isn't the local origin fast forwarded to the remote master, and then the local origin merged into the local master and then the master checked out (presumably the user hasn't edited contents of their master branch). This "warning" message is confusing and the branch.<branch>.merge config option poorly documented. Can someone clarify these things to me please? Thanks, Luben - 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