X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-fetch.txt;h=a9e86fd26b0df6fe7a84ebdd030b9ae4d46f597e;hb=162f41292167a800432fc6bbacfcd9f93a90b0c8;hp=438240c0cf3d8df80cd42015c25d4133eb11b017;hpb=36d277c72d90d32f99616072b64a2652248f5264;p=git.git diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 438240c0..a9e86fd2 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -3,7 +3,7 @@ git-fetch(1) NAME ---- -git-fetch - Download objects and a head from another repository. +git-fetch - Download objects and a head from another repository SYNOPSIS @@ -18,7 +18,7 @@ the objects necessary to complete them. The ref names and their object names of fetched refs are stored in `.git/FETCH_HEAD`. This information is left for a later merge -operation done by "git resolve" or "git octopus". +operation done by "git merge". OPTIONS @@ -27,7 +27,7 @@ include::fetch-options.txt[] include::pull-fetch-param.txt[] - +include::urls.txt[] SEE ALSO --------