>>>>> "Randal" == Randal L Schwartz <merlyn@xxxxxxxxxxxxxx> writes: >>>>> "Junio" == Junio C Hamano <junkio@xxxxxxx> writes: Junio> git-pull: refuse default merge without branch.*.merge Randal> Argh. How do I get back the old behavior? Randal> "git-pull origin" doesn't seem to be enough. Randal> You just broke a bunch of automated scripts for me. Ahh, it's "git-pull . origin". Maybe a bit more warning for non-upward-compatible changes though, please. Or maybe we should presume everything is non-upward compatible? I didn't think a naked "git-pull" was that out of the ordinary. -- Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095 <merlyn@xxxxxxxxxxxxxx> <URL:http://www.stonehenge.com/merlyn/> Perl/Unix/security consulting, Technical writing, Comedy, etc. etc. See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training! - 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