summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
blob: cef4c0ae38d46869420ca6d317e24b279bcb6d9d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
git-pull(1)
===========

NAME
----
git-pull - Pull and merge from another repository.


SYNOPSIS
--------
'git-pull' <repository> <refspec>...


DESCRIPTION
-----------
Runs 'git-fetch' with the given parameters.

When only one ref is downloaded, runs 'git resolve' to merge it
into the local HEAD.  Otherwise uses 'git octopus' to merge them
into the local HEAD.

Note that you can use '.' (current directory) as the
<repository> to pull from the local repository -- this is useful
when merging local branches into the current branch.

OPTIONS
-------
include::pull-fetch-param.txt[]

-a, \--append::
	Append ref names and object names of fetched refs to the
	existing contents of $GIT_DIR/FETCH_HEAD.  Without this
	option old data in $GIT_DIR/FETCH_HEAD will be overwritten.

Author
------
Written by Linus Torvalds <torvalds@osdl.org>
and Junio C Hamano <junkio@cox.net>

Documentation
--------------
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.

GIT
---
Part of the gitlink:git[7] suite