"reset --merge": fix unmerged case

[git.git] / Documentation / git-reset.txt

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index cf2433d52c831569aae73abefd60dfbf7241f5df..dc73dca7361b6f7c608b2d80646bafa7bde3d4e1 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -122,14 +122,14 @@ entries:
        X       U     A    B     --soft  (disallowed)
                                --mixed  X       B     B
                                --hard   B       B     B
-                               --merge  X       B     B
+                               --merge  B       B     B
 
       working index HEAD target         working index HEAD
       ----------------------------------------------------
        X       U     A    A     --soft  (disallowed)
                                --mixed  X       A     A
                                --hard   A       A     A
-                               --merge (disallowed)
+                               --merge  A       A     A
 
 X means any state and U means an unmerged index.