From 0c04094bc153ef1073524267b4eb49989c7b8ccb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 16 Jul 2005 00:17:42 -0700 Subject: [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 Signed-off-by: Linus Torvalds --- Documentation/git-pull-script.txt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'Documentation/git-pull-script.txt') diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt index 44fd09a97a..ec1e7a2a90 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' [ | 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 +Written by Linus Torvalds and Junio C Hamano Documentation -------------- -- cgit v1.2.1