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

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 1b646b73f069e72bc6faa3a058d61ace77c9934c..fa4d133c1bccc088d3c8da65bce4e15cafd394aa 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -9,7 +9,7 @@ git-grep - Print lines matching a pattern
 SYNOPSIS
 --------
 [verse]
-'git-grep' [--cached]
+'git grep' [--cached]
           [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]
           [-v | --invert-match] [-h|-H] [--full-name]
           [-E | --extended-regexp] [-G | --basic-regexp]
@@ -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::