X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-pull-script.txt;h=8111813b857ff0a18bd02ab72c407c5a937dccc7;hb=1efdd27f54e42746c23944cfe77e568673b2a0fa;hp=44fd09a97a2d638a130fd22ce19e99a409d5209a;hpb=2cf565c53c88c557eedd7e5629437b3c6fe74329;p=git.git

diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt
index 44fd09a9..8111813b 100644
--- 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
 --------------