From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Fri, 22 Dec 2006 17:15:15 GMT
Subject: Re: What's in git.git (stable)
Message-ID: <86k60jsvh8.fsf@blue.stonehenge.com>
In-Reply-To: <7vodpw46zj.fsf@assigned-by-dhcp.cox.net>

>>>>> "Junio" == Junio C Hamano <junkio@cox.net> 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@stonehenge.com> <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!