Re: [PATCH 3/3] fetch: optionally store the current remote information in the config

From: Jakub Narebski <jnareb@gmail.com>
Date: Apr 30, 2006, 16:51 UTC
Message-ID: <e32pto$p3a$1@sea.gmane.org>
In-Reply-To: <BAYC1-PASMTP03034CC49FFA3042562BCBAEB00@CEZ.ICE>

sean wrote:

Show 13 quoted lines

> On Sun, 30 Apr 2006 17:49:06 +0200 (CEST)
> Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> 
> 
>> > the terminology and help make things clear.  We're not storing "Pull:"
>> > information, we're storing config/remote.$NICK.fetch data.  It's really
>> > used just by fetch, pull just happens to call fetch.
>>
>> I have no strong feelings either way.
> 
> Yeah, once you "get" it, it's not a problem; but it's not easy when you're
> just learning git to separate fetch and pull.  It's made harder if git
> can't even keep them straight internally. :o/

Well, it could also contain default head we merge to (instead of using what fetch set as FETCH_HEAD, usually current head while fetching), as

        pull = master:origin:merger

Show 7 quoted lines

> [...]
> 
> > The latter should be done, because "git fetch" really is about fetching, 
> > not playing games with the config.
> 
> Then we should also remove the --store option from pull and fetch.  It
> can be set with git-repo-config.

The --store option is similar to using 'git checkout -b newbranch' as a shortcut for 'git branch newbranch' followed by 'git checkout newbranch'.

-- 
Jakub Narebski
Warsaw, Poland