Re: defaults for where to merge from

From: Paolo Bonzini <paolo.bonzini@gmail.com>
Date: Mar 1, 2007, 08:45 UTC
Message-ID: <45E69297.8070001@lu.unisi.ch>
In-Reply-To: <81b0412b0703010033w2e1079a3l6ac6e38c59bdefd5@mail.gmail.com>

Show 5 quoted lines

>> While I am probably going to modify the patch to satisfy Junio, have you
>> noticed that "git branch -d" will delete the section, hence .git/config
>> will not be growing uncontrollably?
> 
> Maybe you also have noticed that it will remove also the reference?

Sure I have.

> How do I remove the garbage you added for TRACKING?!

I see two possibilities:

1) I can add a "git-config --remove-section" option.  So you can do 
"git-pull" to merge onto your branches, and then remove the tracking 
section.

2) I can add a "git-branch --stop-tracking" option, which just removes 
the section.

3) Same as 2), plus I add a "git-branch --no-track" option, which does 
not add the section in the first place.  But I do believe that there is 
no reason why this cannot be the default.

Paolo