Jeff King 8c8674fc95 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>

2011-04-03 12:35:39 -07:00

8.2 KiB

Executable File

Raw Blame History

View Raw