X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-pull-script.txt;h=ec1e7a2a90d54cbc9d3e97081bdce12af9a88b0c;hb=d59a6043a8a7aed97c684fb4f14fe5221df1fcaf;hp=44fd09a97a2d638a130fd22ce19e99a409d5209a;hpb=5569bf9bbedd63a00780fc5c110e0cfab3aa97b9;p=git.git diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt index 44fd09a9..ec1e7a2a 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 --------------