Merge branch 'gfi-maint' into maint

diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 3d508094afc6a79d40b84ce0a3380f487a40d5e8..4deabc376c6698408bee032409434bd7e32740a4 100644 (file)
--- a/Documentation/git-http-fetch.txt
+++ b/Documentation/git-http-fetch.txt
@@ -3,7 +3,7 @@ git-http-fetch(1)
 
 NAME
 ----
-git-http-fetch - downloads a remote git repository via HTTP
+git-http-fetch - Download from a remote git repository via HTTP
 
 
 SYNOPSIS
@@ -39,6 +39,10 @@ commit-id::
 
                <commit-id>['\t'<filename-as-in--w>]
 
+--recover::
+       Verify that everything reachable from target is fetched.  Used after
+       an earlier fetch is interrupted.
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>