[PATCH 4/4] Document git-fetch options

[Sergey Vlasov <vsu@altlinux.ru>]

Add documentation for git-fetch options (including the newly added
--recover option).

---

 Documentation/git-fetch.txt        |    6 ++++++
 Documentation/pull-fetch-param.txt |   19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)

7685a3d50566e908fb8beb2ddb3088877aa9ae0f
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -26,6 +26,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
 ------
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -80,3 +80,22 @@
           <ref>: when pulling/fetching, and <ref>:<ref> when
           pushing.  That is, do not store it locally if
           fetching, and update the same name if pushing.
+
+-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.
+
+-f, \--force::
+	Usually, the command refuses to update a local ref that is
+	not an ancestor of the remote ref used to overwrite it.
+	This flag disables the check.  What this means is that the
+	local repository can lose commits; use it with care.
+
+-r, \--recover::
+	Recover after an interrupted fetch.  When fetching over
+	HTTP(s), this option is passed to 'git-http-fetch', which
+	will then walk through the whole commit tree and fetch all
+	missing objects.  For other protocols this option is
+	ignored, because they don't have problems with recovery
+	after an interrupted fetch.