pull: implement fetch + merge
authorPaul Tan <pyokagan@gmail.com>
Sun, 14 Jun 2015 08:41:52 +0000 (16:41 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Jun 2015 19:40:50 +0000 (12:40 -0700)
commitf2c5baa14e01e74527cc5807e5d47fdf67a05dd3
treee1eb297f9232b283bfb0f685370b4acdb77b2d3b
parent1e1ea69fa4e5fb20baefe9e5422527e971d56a86
pull: implement fetch + merge

Implement the fetch + merge functionality of git-pull, by first running
git-fetch with the repo and refspecs provided on the command line, then
running git-merge on FETCH_HEAD to merge the fetched refs into the
current branch.

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