Merge branch 'cb/log-follow-with-combined'

diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 50d46e1a7bae054d7c1afdeb01b9174a3a9c7002..8497aa4494778134cad5ca2c2b11fb1c824e2a24 100644 (file)
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -25,7 +25,7 @@ SYNOPSIS
           [-W | --function-context]
           [-f <file>] [-e] <pattern>
           [--and|--or|--not|(|)|-e <pattern>...]
-          [ [--exclude-standard] [--cached | --no-index | --untracked] | <tree>...]
+          [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | <tree>...]
           [--] [<pathspec>...]
 
 DESCRIPTION