summaryrefslogtreecommitdiff
path: root/Documentation/git-pull-script.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-07-16 07:17:42 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-16 16:23:06 (GMT)
commit0c04094bc153ef1073524267b4eb49989c7b8ccb (patch)
tree29413b70d9271859636ae3f00462ea3347c4916a /Documentation/git-pull-script.txt
parentf170e4b39d87365cda17b80436ba6db4a2044e88 (diff)
downloadgit-0c04094bc153ef1073524267b4eb49989c7b8ccb.zip
git-0c04094bc153ef1073524267b4eb49989c7b8ccb.tar.gz
git-0c04094bc153ef1073524267b4eb49989c7b8ccb.tar.bz2
[PATCH] Documentation: describe short-hand used in fetch/pull.
Describe short-hand for remote repository used in fetch/pull. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/git-pull-script.txt')
-rw-r--r--Documentation/git-pull-script.txt16
1 files changed, 11 insertions, 5 deletions
diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt
index 44fd09a..ec1e7a2 100644
--- a/Documentation/git-pull-script.txt
+++ b/Documentation/git-pull-script.txt
@@ -4,22 +4,28 @@ v0.1, May 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> [ <head> | tag <tag> ]
+
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, 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>
+Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
Documentation
--------------