git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 44ec754)
pull: do not clobber untracked files on initial pull
authorJeff King <redacted>
Fri, 25 Mar 2011 18:13:31 +0000 (14:13 -0400)
committerJunio C Hamano <redacted>
Sun, 3 Apr 2011 19:35:39 +0000 (12:35 -0700)
commit8c8674fc954d8c4bc46f303a141f510ecf264fcd
tree7051d86def82068ed533d8d8209289e91aaed9d4tree | snapshot
parent44ec754dc766e38684d9ad4563019378730eea82commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-pull.sh diff | blob | history
t/t5520-pull.sh diff | blob | history
git clone https://git.99rst.org/PROJECT