From: Santi Béjar <sbejar@gmail.com>
Date: Thu, 25 Jan 2007 00:52:50 GMT
Subject: Re: [PATCH/RFC] git-fetch: Only fetch in fetch
Message-ID: <8aa486160701241652x375f0d0eoba1cdf3d14550034@mail.gmail.com>
In-Reply-To: <87veiwszpd.fsf@gmail.com>

On 1/25/07, Santi Béjar <sbejar@gmail.com> wrote:
>    I've tried to separate the fetch and merge logic. At the same time it
>    has removed 40 lines of code to the git-*.sh.

Just some words for the basic idea.

git-fetch: fetches the branches from the remote and save this
information in .git/FETCH_HEAD. In .git/FETCH_REMOTE it save
additional information, as the remote nick, the remote url, the
refspec used and the default remote.

git-pull: uses this information to select the branches to merge and
save them in .git/FETCH_MERGE.

See you.

Santi