summaryrefslogtreecommitdiff
path: root/Documentation/git-pull-script.txt
blob: 8111813b857ff0a18bd02ab72c407c5a937dccc7 (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
git-pull-script(1)
==================
v0.99.4, Aug 2005

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


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


DESCRIPTION
-----------
Runs 'git-fetch-script' 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.


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


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 link:git.html[git] suite