X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=Documentation%2Fgit-pull-script.txt;h=8111813b857ff0a18bd02ab72c407c5a937dccc7;hb=cf6de18aabf774dfce7efd9c59babfe9d909d433;hp=ec1e7a2a90d54cbc9d3e97081bdce12af9a88b0c;hpb=89ab859e9452cbc8f1f15afab52257e9b789c899;p=git.git diff --git a/Documentation/git-pull-script.txt b/Documentation/git-pull-script.txt index ec1e7a2a9..8111813b8 100644 --- a/Documentation/git-pull-script.txt +++ b/Documentation/git-pull-script.txt @@ -1,6 +1,6 @@ git-pull-script(1) ================== -v0.1, May 2005 +v0.99.4, Aug 2005 NAME ---- @@ -9,13 +9,16 @@ git-pull-script - Pull and merge from another repository. SYNOPSIS -------- -'git-pull-script' [ | tag ] +'git-pull-script' ... DESCRIPTION ----------- -Runs 'git-fetch-script' with the given parameters, then -'git-resolve-script' to merge the local HEAD and FETCH_HEAD. +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 @@ -25,7 +28,8 @@ include::pull-fetch-param.txt[] Author ------ -Written by Linus Torvalds and Junio C Hamano +Written by Linus Torvalds +and Junio C Hamano Documentation --------------