Code

Merge refs/heads/master from .
[git.git] / Documentation / git-pull-script.txt
1 git-pull-script(1)
2 ==================
3 v0.99.4, Aug 2005
5 NAME
6 ----
7 git-pull-script - Pull and merge from another repository.
10 SYNOPSIS
11 --------
12 'git-pull-script' <repository> [ <head> | tag <tag> ]
15 DESCRIPTION
16 -----------
17 Runs 'git-fetch-script' with the given parameters, then
18 'git-resolve-script' to merge the local HEAD and FETCH_HEAD.
21 OPTIONS
22 -------
23 include::pull-fetch-param.txt[]
26 Author
27 ------
28 Written by Linus Torvalds <torvalds@osdl.org>
29 and Junio C Hamano <junkio@cox.net>
31 Documentation
32 --------------
33 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
35 GIT
36 ---
37 Part of the link:git.html[git] suite