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 141b76768c61c42e6d876ddb840897cb8805dc96..e830deeff321c67781edb1a355c3d6829c04038d 100644 (file)
--- a/Documentation/git-local-fetch.txt
+++ b/Documentation/git-local-fetch.txt
@@ -44,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>]