user-manual: quick-start updates

[git.git] / Documentation / git-fetch.txt

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 73f8a99ffe6e3d6b09377226d3fb83fbf6494994..5fbeab76b7214f871865eaefd5dbe744036676b0 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -3,12 +3,12 @@ git-fetch(1)
 
 NAME
 ----
 
 NAME
 ----

-git-fetch - Download objects and a head from another repository.
+git-fetch - Download objects and refs from another repository

 
 
 SYNOPSIS
 --------
 
 
 SYNOPSIS
 --------

-'git-fetch' <repository> <refspec>...
+'git-fetch' <options> <repository> <refspec>...

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -17,25 +17,25 @@ 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
 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".
+
+When <refspec> stores the fetched result in tracking branches,
+the tags that point at these branches are automatically
+followed.  This is done by first fetching from the remote using
+the given <refspec>s, and if the repository has objects that are
+pointed by remote tags that it does not yet have, then fetch
+those missing tags.  If the other end has tags that point at
+branches you are not interested in, you will not get them.

 
 
 OPTIONS
 -------
 
 
 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.
-
--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
 --------
 
 SEE ALSO
 --------