merge-recursive: options to ignore whitespace changes

diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 70fb635291876e20acbc75451c875dcecffa9056..d91cb7ff85b8c05a39cd18757bc66a16662c5150 100644 (file)
--- a/Documentation/git-http-fetch.txt
+++ b/Documentation/git-http-fetch.txt
@@ -8,7 +8,7 @@ git-http-fetch - Download from a remote git repository via HTTP
 
 SYNOPSIS
 --------
-'git-http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>
+'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>
 
 DESCRIPTION
 -----------
@@ -35,7 +35,7 @@ commit-id::
 
 --stdin::
        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
+       case), 'git http-fetch' expects lines on stdin in the format
 
                <commit-id>['\t'<filename-as-in--w>]