Merge branch 'jk/combine-diff-binary-etc'

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index e88e9c2d55d19844ca56bc2d5b7b683e329b6fb8..46a96f2313e0cb48bff9d5de26f403b35d327d2c 100644 (file)
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -53,6 +53,11 @@ OPTIONS
        trees that are not directly related to the current
        working tree status into a temporary index file.
 
+-n::
+--dry-run::
+       Check if the command would error out, without updating the index
+       nor the files in the working tree for real.
+
 -v::
        Show the progress of checking files out.
 
@@ -416,27 +421,11 @@ turn `core.sparseCheckout` on in order to have sparse checkout
 support.
 
 
-BUGS
-----
-In order to match a directory with $GIT_DIR/info/sparse-checkout,
-trailing slash must be used. The form without trailing slash, while
-works with .gitignore, does not work with sparse checkout.
-
-
 SEE ALSO
 --------
 linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
 linkgit:gitignore[5]
 
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
 Part of the linkgit:git[1] suite