>>>>> "Junio" == Junio C Hamano <junkio@xxxxxxx> writes: Junio> git-pull: refuse default merge without branch.*.merge Argh. How do I get back the old behavior? "git-pull origin" doesn't seem to be enough. You just broke a bunch of automated scripts for me. -- 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