summaryrefslogtreecommitdiff
path: root/Documentation/git-pull.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-pull.txt')
-rw-r--r--Documentation/git-pull.txt41
1 files changed, 41 insertions, 0 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
new file mode 100644
index 0000000000..235a036b9d
--- /dev/null
+++ b/Documentation/git-pull.txt
@@ -0,0 +1,41 @@
+git-pull(1)
+===========
+v0.99.4, Aug 2005
+
+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.
+
+
+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
+