Re: defaults for where to merge from

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

Show 5 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?

Paolo

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