From: Martin Waitz <tali@admingilde.org>
Date: Mon, 22 May 2006 10:20:29 GMT
Subject: Re: Current Issues #3
Message-ID: <20060522102029.GE12810@admingilde.org>
In-Reply-To: <7v8xoue9eo.fsf@assigned-by-dhcp.cox.net>

hoi :)

On Mon, May 22, 2006 at 01:44:15AM -0700, Junio C Hamano wrote:
>     1. "upstream" refers to the remote section to use when
>        running "git-{fetch,pull,push}" while on that branch.
> 
> 	[branch "master"]
> 		upstream = "origin"

what do you do for [branch "next"] here?

Does it make sense to regard all refs/remotes/*/<branchname> as
upstream and merge these into the current branch when pulling?

Perhaps a pull could even merge all newly fetched remote heads
into the corresponding branch, but for that we'd need to be
able to merge without using the working dir.

-- 
Martin Waitz