X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-fetch.txt;h=a67dc340fd63ad389fb961e403781331c2a32cf4;hb=155d12912fec6c60ead6d6c1febda5fa6e6eb128;hp=73f8a99ffe6e3d6b09377226d3fb83fbf6494994;hpb=87ce294c9129879f717f8749cae1c659e18a3823;p=git.git

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 73f8a99f..a67dc340 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' <repository> <refspec>...
+'git-fetch' <options> <repository> <refspec>...
 
 
 DESCRIPTION
@@ -17,25 +17,17 @@ 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
-operation done by "git resolve" or "git octopus".
+in `.git/FETCH_HEAD`.  This information is left for a later merge
+operation done by "git merge".
 
 
 OPTIONS
 -------
-include::pull-fetch-param.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::fetch-options.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.
+include::pull-fetch-param.txt[]
 
+include::urls.txt[]
 
 SEE ALSO
 --------