pull: do not clobber untracked files on initial pull
[git/git.git] / git-pull.sh
index 63b063a..e31226b 100755 (executable)
@@ -274,7 +274,7 @@ esac
 if test -z "$orig_head"
 then
        git update-ref -m "initial pull" HEAD $merge_head "$curr_head" &&
-       git read-tree --reset -u HEAD || exit 1
+       git read-tree -m -u HEAD || exit 1
        exit
 fi