Merge branch 'maint' of git://repo.or.cz/git-gui into maint

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

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 017f6466010f31d9084257d3708aee18c6049abf..d982f961fc5111ce0e37dd571530652fca147d01 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -1,15 +1,14 @@
 git-fetch(1)
 ============
 git-fetch(1)
 ============

-v0.99.5, Aug 2005

 
 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


@@ -18,14 +17,30 @@ 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::fetch-options.txt[]
+

 include::pull-fetch-param.txt[]
 
 include::pull-fetch-param.txt[]
 

+include::urls-remotes.txt[]
+
+SEE ALSO
+--------
+linkgit:git-pull[1]
+

 
 Author
 ------
 
 Author
 ------


@@ -33,9 +48,9 @@ Written by Linus Torvalds <torvalds@osdl.org> and
 Junio C Hamano <junkio@cox.net>
 
 Documentation
 Junio C Hamano <junkio@cox.net>
 
 Documentation

---------------
+-------------

 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---

-Part of the link:git.html[git] suite
+Part of the linkgit:git[7] suite