X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-fetch-script.txt;h=d15222b5619fbf0fae24f4aac764b6de0c29817c;hb=99977bd5fdeabbd0608a70e9411c243007ec4ea2;hp=937df05dbc729d3cea6d3ec6e9f540cd84dbeb8a;hpb=89ab859e9452cbc8f1f15afab52257e9b789c899;p=git.git diff --git a/Documentation/git-fetch-script.txt b/Documentation/git-fetch-script.txt index 937df05d..d15222b5 100644 --- a/Documentation/git-fetch-script.txt +++ b/Documentation/git-fetch-script.txt @@ -1,6 +1,6 @@ git-fetch-script(1) =================== -v0.1, July 2005 +v0.99.5, Aug 2005 NAME ---- @@ -9,24 +9,17 @@ git-fetch-script - Download objects and a head from another repository. SYNOPSIS -------- -'git-fetch-script' [ | tag ] +'git-fetch-script' ... DESCRIPTION ----------- -Fetches a named head or a tag from another repository, along -with the objects necessary to complete that head or tag. The -head to pull defaults to HEAD if unspecified. The head or tag -fetched from the remote repository is stored in -$GIT_DIR/FETCH_HEAD. +Fetches named heads or tags from another repository, along with +the objects necessary to complete them. -When a is specified, the fetched from the remote is -also copied to the local $GIT_DIR/tags/ file. When no - nor is specified, and was specified -with the short-hand notation (i.e. naming a file under the -$GIT_DIR/branches directory), the head fetched from the remote -repository is also copied to the local $GIT_DIR/heads/ -file. +The ref names and their object names of fetched refs are stored +in $GIT_DIR/FETCH_HEAD. This information is left for a later merge +operation done by "git resolve" or "git octopus". OPTIONS @@ -36,7 +29,8 @@ include::pull-fetch-param.txt[] Author ------ -Written by Linus Torvalds and Junio C Hamano +Written by Linus Torvalds and +Junio C Hamano Documentation --------------