From: Martin Schlemmer <azarah@nosferatu.za.org>
Date: Tue, 19 Apr 2005 10:05:10 GMT
Subject: Re: Change "pull" to _only_ download, and "git update"=pull+merge?
Message-ID: <1113905110.1262.1.camel@nosferatu.lan>
In-Reply-To: <20050419092812.GE2393@pasky.ji.cz>

On Tue, 2005-04-19 at 11:28 +0200, Petr Baudis wrote:
> Dear diary, on Tue, Apr 19, 2005 at 11:18:55AM CEST, I got a letter
> where David Greaves <david@dgreaves.com> told me that...
>
> Dunno. I do it personally all the time, with git at least.
> 
> What do others think? :-)
> 

I think pull is pull.  If you are doing lots of local stuff and do not
want it overwritten, it should have been in a forked branch.

> I start to like the pull/update distinction, and I think I'll go for it.
> 

-- 
Martin Schlemmer