diff options
Diffstat (limited to 'Documentation/git-reset.txt')
| -rw-r--r-- | Documentation/git-reset.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 2198c8ebd..cf2433d52 100644 --- 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 ---------------------------------------------------- |