Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".

From: Jeff King <peff@peff.net>
Date: Feb 4, 2007, 02:38 UTC
Message-ID: <20070204023818.GA27644@coredump.intra.peff.net>
In-Reply-To: <7vzm7uy8ng.fsf@assigned-by-dhcp.cox.net>

On Sat, Feb 03, 2007 at 06:10:59PM -0800, Junio C Hamano wrote:

Show 8 quoted lines

> I do not think it is wrong to have a separate mechanism (and it
> might end up being called as "mergelocal" which you said might
> be a terrible name) for that.  I just think it is probably a
> wrong thing to do to use branch.*.merge for that. As you said,
> operations you are interested in like format-patch (and perhaps
> rebase) of a local branch relative to another locally available
> ref (be it another branch or a tracking branch) do not involve
> fetching (hence pulling) necessarily.

Good, it looks like we are mostly agreeing on this then (the feature might have some use, but it should _not_ be tacked onto branch.*.merge). I will give it some thought until v1.5.0 has settled, and then hopefully submit some patches.

-Peff