X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-fetch.txt;h=438240c0cf3d8df80cd42015c25d4133eb11b017;hb=93d69d86912c44206543f6670e93f9fc6f2f859f;hp=73f8a99ffe6e3d6b09377226d3fb83fbf6494994;hpb=90279074ca5cc336a8bfffd47d19d089b291b432;p=git.git diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 73f8a99f..438240c0 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -8,7 +8,7 @@ git-fetch - Download objects and a head from another repository. SYNOPSIS -------- -'git-fetch' ... +'git-fetch' ... DESCRIPTION @@ -17,24 +17,16 @@ Fetches named heads or tags from another repository, along with the objects necessary to complete them. 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 +in `.git/FETCH_HEAD`. This information is left for a later merge operation done by "git resolve" or "git octopus". OPTIONS ------- -include::pull-fetch-param.txt[] +include::fetch-options.txt[] --a, \--append:: - Append ref names and object names of fetched refs to the - existing contents of $GIT_DIR/FETCH_HEAD. Without this - option old data in $GIT_DIR/FETCH_HEAD will be overwritten. +include::pull-fetch-param.txt[] --u, \--update-head-ok:: - By default 'git-fetch' refuses to update the head which - corresponds to the current branch. This flag disables the - check. Note that fetching into the current branch will not - update the index and working directory, so use it with care. SEE ALSO