Re: most commonly used git commands?

From: Johannes Sixt <j.sixt@eudaptics.com>
Date: Jun 28, 2007, 14:49 UTC
Message-ID: <4683CA7A.7F8070D7@eudaptics.com>
In-Reply-To: <4683C5D2.FDF4ED02@eudaptics.com>

Johannes Sixt wrote:

> AFAIAC, it's alright to fall back to update-index for those occasions,
> even though they are not that rare due to a deficiency of
> merge-recursive: When it merges an executable file, it loses the +x bit,
> even if core.filemode=false!

I take that back.

The deficiency is not in merge-recursive, but in 'git add'. The problem is that after a conflicted merge of an executable file 'git add' loses the +x bit even if core.filemode=false.

-- Hannes