Merge branch 'ts/daemon'

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

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 71693650c4194514f62dd5d8524b446dd8641805..a9e86fd26b0df6fe7a84ebdd030b9ae4d46f597e 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 a head from another repository

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

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

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -17,24 +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[]
 

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

 
 
 Author
 
 
 Author