On Wed, 15 Nov 2006 14:52:32 -0800 Carl Worth <cworth@xxxxxxxxxx> wrote: > The real fix is to stop glossing over git-merge and just give it a > usable syntax. Agreed 100% There's just no good reason to hide the user level merge command inside of pull. Sean. - 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