checkout -m: recreate merge when checking out of unmerged index

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index cbda116581cd638ae1cfda1218d37f1a2b446c73..fa4d133c1bccc088d3c8da65bce4e15cafd394aa 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -91,7 +91,7 @@ OPTIONS
 --files-without-match::
        Instead of showing every matched line, show only the
        names of files that contain (or do not contain) matches.
-       For better compatibility with git-diff, --name-only is a
+       For better compatibility with 'git-diff', --name-only is a
        synonym for --files-with-matches.
 
 -c::