summaryrefslogtreecommitdiff
path: root/t/t5100
diff options
context:
space:
mode:
authorLibravatar Paul Tan <pyokagan@gmail.com>2015-06-18 18:54:05 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-18 13:17:24 -0700
commitfe911b8ca0b466697b38880512ea2b28f2699dbd (patch)
treece1df7bebacd2abcf29101649f2819a19883b506 /t/t5100
parentpull: check if in unresolved merge state (diff)
downloadtgif-fe911b8ca0b466697b38880512ea2b28f2699dbd.tar.xz
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>
Diffstat (limited to 't/t5100')
0 files changed, 0 insertions, 0 deletions