Re: [PATCH] git add: respect core.filemode even with unmerged entriesin the index

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jun 29, 2007, 10:07 UTC
Message-ID: <Pine.LNX.4.64.0706291106190.4438@racer.site>
In-Reply-To: <4684AD41.9868C32F@eudaptics.com>

Hi,

On Fri, 29 Jun 2007, Johannes Sixt wrote:

> However, if only two stages are present, the file mode is still taken 
> from the file instead of from the index. As that easy to solve (at least 
> for the unambiguous case)?

It might be related to the bug Junio found, i.e. that I assumed stage 1 to be "ours".

Ciao, Dscho

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