From: Jon Loeliger <jdl@freescale.com>
Date: Wed, 29 Nov 2006 21:32:36 GMT
Subject: Re: [RFD] making separate-remote layout easier to use
Message-ID: <1164835956.4724.62.camel@cashmere.sps.mot.com>
In-Reply-To: <7v1wnr19do.fsf@assigned-by-dhcp.cox.net>

On Sat, 2006-11-25 at 15:53, Junio C Hamano wrote:

> I am not sure if 'merge in corresponding branch' is the only
> valid workflow, however. I am reluctant to make the system
> automatically do so if the solution makes other workflows more
> painful to follow.  Automatically merging remotes/origin/$foo
> when on $foo branch is not good enough, in other words (also,
> there may be a hierarchy under remotes/ other than origin).  It
> might make sense to introduce "Merge: " in remotes/ file and if
> they are present use "Pull: " only to decide what are fetched
> and use "Merge: " to decide what is merged (if we were doing the
> system from scratch, the former would have been named "Fetch: "
> but it is too late now).

Heh.  It was too late back here too!

    From: 	Jon Loeliger <jdl@freescale.com>
    To: 	Git List <git@vger.kernel.org>
    Subject: 	Re: GIT 0.99.7d, and end of week status.
    Date: 	Mon, 26 Sep 2005 15:17:32 -0500
    Message-Id:  <1127765852.5735.36.camel@cashmere.sps.mot.com>

jdl