git-diff: do not turn off -p/-M with any diff options.

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

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 017f646..438240c 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,24 +17,32 @@ 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
+in `.git/FETCH_HEAD`.  This information is left for a later merge

 operation done by "git resolve" or "git octopus".
 
 
 OPTIONS
 -------
 operation done by "git resolve" or "git octopus".
 
 
 OPTIONS
 -------

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

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

+
+SEE ALSO
+--------
+gitlink:git-pull[1]
+
+

 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
 Junio C Hamano <junkio@cox.net>
 
 Documentation
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
 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 gitlink:git[7] suite