Re: git pull and merging.

Hi,

On Wed, 6 Dec 2006, Peter Baumann wrote:

On 2006-12-06, Johannes Schindelin [off-list ref] wrote:

quoted

You can have the same effect as what Junio wrote with the config:

$ git repo-config remote.origin.url git://git.kernel.org/pub/scm/git/git.git
$ git repo-config remote.origin.fetch \
	refs/heads/master:refs/remotes/origin/master
$ git repo-config remote.origin.fetch \
	refs/heads/next:refs/remotes/origin/next ^$
$ git repo-config remote.origin.fetch \
	+refs/heads/pu:refs/remotes/origin/pu ^$

What's that ^$ for?

We misuse the "nice" ini format a little bit in git: we allow multiple 
values for certain keys, like "remote.origin.fetch".

The normal mode for repo-config is to replace the value for the given key. 
By appending a regular expression, you can limit the replacement to 
certain matching _values_. And since "^$" means empty string, it does not 
match any, ensuring an append instead of a replace.

Ciao,
Dscho