git-pull: further safety while on tracking branch.
authorJunio C Hamano <junkio@cox.net>
Wed, 22 Mar 2006 09:09:43 +0000 (01:09 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 22 Mar 2006 09:09:43 +0000 (01:09 -0800)
commitcf46e7b8999f25d5d7f2acd64701a100e403ee03
tree1d6adc6418f3aa80a4454d2c3efb63bcf97a5d8f
parent3103cf9e1e09b0045a60542f24a2a1e4ed7b1237
git-pull: further safety while on tracking branch.

Running 'git pull' while on the tracking branch has a built-in
safety valve to fast-forward the index and working tree to match
the branch head, but it errs on the safe side too cautiously.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-pull.sh