Hi On 1.7.2.3, pulling the root commit overwrites untracked files Minimal working example: $ git init wc1 $ cd wc1 $ echo a > a $ git add a $ git commit -m "added a" $ mkdir ../wc2 $ cd ../wc2 $ echo b > a $ git init $ git remote add origin ../wc1 $ git pull origin master $ # expected: error: Untracked working tree file 'a' would be overwritten by merge. Aborting $ # actual: no error $ cat a $ # expected: b $ # actual: a An excerpt from the session: gert@planc ~/test/wc2 git[master?] 768$ git pull origin master remote: Counting objects: 3, done. remote: Total 3 (delta 0), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. >From ../wc1 * branch master -> FETCH_HEAD gert@planc ~/test/wc2 git[master] 769$ cat a a -- Gert Palok -- 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