pull: do not clobber untracked files on initial pull
commit8c8674fc954d8c4bc46f303a141f510ecf264fcd
authorJeff King <peff@peff.net>
Fri, 25 Mar 2011 18:13:31 +0000 (25 14:13 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:35:39 +0000 (3 12:35 -0700)
tree7051d86def82068ed533d8d8209289e91aaed9d4
parent44ec754dc766e38684d9ad4563019378730eea82
pull: do not clobber untracked files on initial pull

For a pull into an unborn branch, we do not use "git merge"
at all. Instead, we call read-tree directly. However, we
used the --reset parameter instead of "-m", which turns off
the safety features.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-pull.sh
t/t5520-pull.sh