Merge branch 'maint-1.5.5' into maint-1.5.6

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 2e097a140c3e09375bd851d73f2680800745e187..58fb906ef68e8b800b0616a5655aa757a362ed6e 100644 (file)
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -50,6 +50,9 @@ OPTIONS
        trees that are not directly related to the current
        working tree status into a temporary index file.
 
+-v::
+       Show the progress of checking files out.
+
 --trivial::
        Restrict three-way merge by `git-read-tree` to happen
        only if there is no file-level merging required, instead
@@ -361,4 +364,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite