Merge branches 'jc/rev-list' and 'jc/pack-thin' into next

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

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 1fa9f4dbf4198e35f49e299f772c054f50251b63..a67dc340fd63ad389fb961e403781331c2a32cf4 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -1,6 +1,5 @@
 git-fetch(1)
 ============
 git-fetch(1)
 ============

-v0.99.5, Aug 2005

 
 NAME
 ----
 
 NAME
 ----


@@ -9,7 +8,7 @@ git-fetch - Download objects and a head from another repository.
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

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

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -18,19 +17,21 @@ 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".

 
 
 OPTIONS
 -------
 
 
 OPTIONS
 -------

+include::fetch-options.txt[]
+

 include::pull-fetch-param.txt[]
 
 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.
+include::urls.txt[]
+
+SEE ALSO
+--------
+gitlink:git-pull[1]

 
 
 Author
 
 
 Author