[PATCH] Documentation for git-clone-dumb-http.

[git.git] / Documentation / git-pull-script.txt

diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt
index 44fd09a..8111813 100644 (file)
--- a/Documentation/git-pull-script.txt
+++ b/Documentation/git-pull-script.txt
@@ -1,25 +1,35 @@
 git-pull-script(1)
 ==================
-v0.1, May 2005
+v0.99.4, Aug 2005
 
 NAME
 ----
-git-pull-script - Script used by Linus to pull and merge a remote repository
+git-pull-script - Pull and merge from another repository.
 
 
 SYNOPSIS
 --------
-'git-pull-script'
+'git-pull-script' <repository> <refspec>...
+
 
 DESCRIPTION
 -----------
-This script is used by Linus to pull from a remote repository and perform
-a merge.
+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
 --------------