revised^2: git-daemon extra paranoia, and path DWIM
[alt-git.git] / Documentation / git-pull.txt
blob952779292b56ad70aae4d287357a8ca3db61414c
1 git-pull(1)
2 ===========
4 NAME
5 ----
6 git-pull - Pull and merge from another repository.
9 SYNOPSIS
10 --------
11 'git-pull' <repository> <refspec>...
14 DESCRIPTION
15 -----------
16 Runs 'git-fetch' with the given parameters.
18 When only one ref is downloaded, runs 'git resolve' to merge it
19 into the local HEAD.  Otherwise uses 'git octopus' to merge them
20 into the local HEAD.
23 OPTIONS
24 -------
25 include::pull-fetch-param.txt[]
28 Author
29 ------
30 Written by Linus Torvalds <torvalds@osdl.org>
31 and Junio C Hamano <junkio@cox.net>
33 Documentation
34 --------------
35 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
37 GIT
38 ---
39 Part of the gitlink:git[7] suite