reset: use "unpack_trees()" directly instead of "git read-tree"

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 2198c8ebd6229ddcb21142324d61023ef690fcc7..cf2433d52c831569aae73abefd60dfbf7241f5df 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -122,7 +122,7 @@ entries:
        X       U     A    B     --soft  (disallowed)
                                --mixed  X       B     B
                                --hard   B       B     B
-                               --merge (disallowed)
+                               --merge  X       B     B
 
       working index HEAD target         working index HEAD
       ----------------------------------------------------