diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-06-14 16:41:52 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-15 12:40:50 -0700 |
| commit | f2c5baa14e01e74527cc5807e5d47fdf67a05dd3 (patch) | |
| tree | e1eb297f9232b283bfb0f685370b4acdb77b2d3b /parse-options.h | |
| parent | pull: implement skeletal builtin pull (diff) | |
| download | tgif-f2c5baa14e01e74527cc5807e5d47fdf67a05dd3.tar.xz | |
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>
Diffstat (limited to 'parse-options.h')
0 files changed, 0 insertions, 0 deletions