Re: Git rescue mission

From: Bill Lear <rael@zopyra.com>
Date: Feb 8, 2007, 22:33 UTC
Message-ID: <17867.42280.577214.422651@lisa.zopyra.com>
In-Reply-To: <Pine.LNX.4.64.0702081408140.8424@woody.linux-foundation.org>

On Thursday, February 8, 2007 at 14:13:47 (-0800) Linus Torvalds writes:

Show 16 quoted lines

>On Thu, 8 Feb 2007, Bill Lear wrote:
>> 
>> However, I still have a few open issues with the other branch of this
>> discussion, i.e., why can we not have an update operation that
>> respects branches in the first place, as 'git pull' seems to do, when
>> run from the master branch?
>
>Actually, git does that all correctly for other branches too, but only in 
>git-1.5.
>
>...
>So it might be worth while trying out git-1.5.0-rc4, and seeing if that 
>solves some of the UI issues for you guys. It changes things like where 
>the default remote branches are, and makes the distinction between "my 
>local copy of branch X" and "the remote branch X" much clearer, which has 
>clearly been a UI problem.

Ok, very reasonable. I've been our corporate guinea pig, so I'll give this a whirl. One thing I'm very, very happy about in git is the ability to quickly experiment. Believe it or not, I have solved actual git problems in our company by doing just that. Of necessity, it's largely my complaints and problems that are aired here, though.

Bill