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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
