Merge branch 'fixes'

diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 017f6466010f31d9084257d3708aee18c6049abf..c0b5aac5f281b07aea61183c4c6a09b79447c8ea 100644 (file)
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -1,6 +1,5 @@
 git-fetch(1)
 ============
-v0.99.5, Aug 2005
 
 NAME
 ----
@@ -26,6 +25,12 @@ OPTIONS
 -------
 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.
+
 
 Author
 ------
@@ -33,9 +38,9 @@ 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
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite