X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-pull-script.txt;h=ad9d3ab31534ab2f71bb791eb96970c7048ac843;hb=cdacb6208fdb6779b21350644d61bd90e63db3d5;hp=44fd09a97a2d638a130fd22ce19e99a409d5209a;hpb=f1a7eb36b017c62d9a007b6b8660bdeec3f94f97;p=git.git diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt index 44fd09a9..ad9d3ab3 100644 --- a/Documentation/git-pull-script.txt +++ b/Documentation/git-pull-script.txt @@ -1,25 +1,32 @@ 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' [ | 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 +and Junio C Hamano Documentation --------------