Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 3d508094afc6a79d40b84ce0a3380f487a40d5e8..389c6edfb8aef3e77fa2a02c3472b03dce1e4f25 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
@@ -34,11 +34,15 @@ commit-id::
         the local end after the transfer is complete.
 
 --stdin::
-       Instead of a commit id on the commandline (which is not expected in this
+       Instead of a commit id on the command line (which is not expected in this
        case), 'git-http-fetch' expects lines on stdin in the format
 
                <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>
@@ -50,4 +54,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 GIT
 ---
 Part of the gitlink:git[7] suite
-