pull: fast-forward working tree if head is updated
commitfe911b8ca0b466697b38880512ea2b28f2699dbd
authorPaul Tan <pyokagan@gmail.com>
Thu, 18 Jun 2015 10:54:05 +0000 (18 18:54 +0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2015 20:17:24 +0000 (18 13:17 -0700)
treece1df7bebacd2abcf29101649f2819a19883b506
parent4a4cf9e821f604b79817bc37b475828f3fb8b0a4
pull: fast-forward working tree if head is updated

Since b10ac50 (Fix pulling into the same branch., 2005-08-25), git-pull,
upon detecting that git-fetch updated the current head, will
fast-forward the working tree to the updated head commit.

Re-implement this behavior.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/pull.c