summaryrefslogtreecommitdiff
path: root/t/t1200-tutorial.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-03-25 18:13:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-25 21:16:27 (GMT)
commit4b3ffe5184bd550dddacdd0b32b18ad0e73c7908 (patch)
tree1957ccd2bee4a761f410219c8fa60cd46b438ad9 /t/t1200-tutorial.sh
parent97b1b4f3a682377aa8f03348618e79bd1df1772e (diff)
downloadgit-4b3ffe5184bd550dddacdd0b32b18ad0e73c7908.zip
git-4b3ffe5184bd550dddacdd0b32b18ad0e73c7908.tar.gz
git-4b3ffe5184bd550dddacdd0b32b18ad0e73c7908.tar.bz2
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>
Diffstat (limited to 't/t1200-tutorial.sh')
0 files changed, 0 insertions, 0 deletions