Re: defaults for where to merge from

["Alex Riesen" <raa.lkml@gmail.com>]

On 3/1/07, Paolo Bonzini <paolo.bonzini@gmail.com> wrote:
> > 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.

This is irrelevant in this particular context. It is just wrong here:
are you sure you _CAN_ know what it is you are removing?
Git config syntax is loosely defined, and branch or remote sections
can have important user information. Which he does not immediately
see typing git config --remove-section branch.abc _JUST_ to get
rid of the configuration he did not want in first place!

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

This is independent and _probably_ not really needed. It is also
probably more complex than you think. Consider:

[remote "abc"]
  url = ...
  fetch = refs/heads/*:refs/remotes/abc/*
  fetch = refs/heads/test:refs/heads/abc-test

> 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.

This is just what I asked for except for the first part.
And I see no reason for it to _BE_ the default.
Actually, how about making the default configurable _AND_ have
the --no-track option (for scripting)?