Am 13.06.2014 03:38, schrieb Joey Hess:
If git merge --no-commit is used to merge a commit adding a
file with an unusual mode -- specifically a symlink which has "mode" 120000,
it fails to stage the right mode into the index.
This only happens when core.symlinks=false. I noticed it on FAT, but
have managed to reproduce it on ext4.
There's a similar breakage with core.filemode=false, which loses the x bit
of files that need a content merge.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html