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

From: sean <seanlkml@sympatico.ca>
Date: Apr 30, 2006, 17:19 UTC
Message-ID: <BAYC1-PASMTP054CF113E95D45B8778DACAEB00@CEZ.ICE>
In-Reply-To: <e32pto$p3a$1@sea.gmane.org>

On Sun, 30 Apr 2006 18:51:54 +0200
Jakub Narebski <jnareb@gmail.com> wrote:

> 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

Then lets take a simple case; we clone a new repo, and it has:

	[remote.origin]
	  url = git://outthere.com
	  fetch = master:origin:master
	  fetch = next:next

And we create two new branches:

	git branch br1 next ; git branch br2 next

Now say that we want a bare "git pull" to cause a merge from the "next" branch regardless of which new branch we have checked out. In the above scheme we have to do something like:

	   fetch = next:next:br1:br2

That doesn't look right.  It seems better to have:
	
	[branch.origin]
		description = "Pristine master from Junio"
	[branch.br1]
		description = "blah"
		defaultMerge = "next"
	[branch.br2]
		description = "More blah"
		LastMerge = 03/27/2008 3am
		defaultMerge = "next"
		qgitTagColor = Blue

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

Okay.

Sean