Re: defaults for where to merge from

From: Alex Riesen <raa.lkml@gmail.com>
Date: Mar 1, 2007, 08:33 UTC
Message-ID: <81b0412b0703010033w2e1079a3l6ac6e38c59bdefd5@mail.gmail.com>
In-Reply-To: <45E68EDE.2090405@lu.unisi.ch>

On 3/1/07, Paolo Bonzini <paolo.bonzini@gmail.com> wrote:

Show 11 quoted lines

>
> >> If everyone hated the old behavior, old users should already be careful
> >> about not git-pull'ing (without options) from any branch but master.  So
> >> they won't see any difference.
> >
> > except for .git/config growing uncontrollably
>
> 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? How do I remove the garbage you added for TRACKING?!

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.