Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

diff --git a/Documentation/git-local-fetch.txt b/Documentation/git-local-fetch.txt
index dd9e2387fcca205b2ec80d7f6207ce84c53a7377..e830deeff321c67781edb1a355c3d6829c04038d 100644 (file)
--- a/Documentation/git-local-fetch.txt
+++ b/Documentation/git-local-fetch.txt
@@ -8,10 +8,14 @@ git-local-fetch - Duplicate another git repository on a local system
 
 SYNOPSIS
 --------
-'git-local-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] commit-id path
+[verse]
+'git-local-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n]
+                  commit-id path
 
 DESCRIPTION
 -----------
+THIS COMMAND IS DEPRECATED.
+
 Duplicates another git repository on a local system.
 
 OPTIONS
@@ -40,7 +44,7 @@ OPTIONS
         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-local-fetch' expects lines on stdin in the format
 
                <commit-id>['\t'<filename-as-in--w>]
@@ -60,4 +64,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 GIT
 ---
 Part of the gitlink:git[7] suite
-