| commit | 4b3ffe5184bd550dddacdd0b32b18ad0e73c7908 | |
| author | Jeff King <peff@peff.net> | |
| Fri, 25 Mar 2011 18:13:31 +0000 (25 14:13 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Mar 2011 21:16:27 +0000 (25 14:16 -0700) | ||
| tree | 1957ccd2bee4a761f410219c8fa60cd46b438ad9 | treesnapshot (tar.gz zip) |
| parent | 97b1b4f3a682377aa8f03348618e79bd1df1772e | commitdiff |
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>
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 | diffblobblamehistory | |
| t/t5520-pull.sh | diffblobblamehistory |