summaryrefslogtreecommitdiff
path: root/Documentation/git-pull-script.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-pull-script.txt')
-rw-r--r--Documentation/git-pull-script.txt37
1 files changed, 37 insertions, 0 deletions
diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt
new file mode 100644
index 0000000..ec1e7a2
--- /dev/null
+++ b/Documentation/git-pull-script.txt
@@ -0,0 +1,37 @@
+git-pull-script(1)
+==================
+v0.1, May 2005
+
+NAME
+----
+git-pull-script - Pull and merge from another repository.
+
+
+SYNOPSIS
+--------
+'git-pull-script' <repository> [ <head> | tag <tag> ]
+
+
+DESCRIPTION
+-----------
+Runs 'git-fetch-script' with the given parameters, then
+'git-resolve-script' to merge the local HEAD and FETCH_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
+