Fix off-by-one error in git-merge
[alt-git.git] / Documentation / git-pull.txt
blob235a036b9d227bcc7a20361a4ec706df2f193d07
1 git-pull(1)
2 ===========
3 v0.99.4, Aug 2005
5 NAME
6 ----
7 git-pull - Pull and merge from another repository.
10 SYNOPSIS
11 --------
12 'git-pull' <repository> <refspec>...
15 DESCRIPTION
16 -----------
17 Runs 'git-fetch' with the given parameters.
19 When only one ref is downloaded, runs 'git resolve' to merge it
20 into the local HEAD.  Otherwise uses 'git octopus' to merge them
21 into the local HEAD.
24 OPTIONS
25 -------
26 include::pull-fetch-param.txt[]
29 Author
30 ------
31 Written by Linus Torvalds <torvalds@osdl.org>
32 and Junio C Hamano <junkio@cox.net>
34 Documentation
35 --------------
36 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
38 GIT
39 ---
40 Part of the link:git.html[git] suite