From: Junio C Hamano <gitster@pobox.com> Date: Sun, 7 Mar 2010 20:47:17 +0000 (-0800) Subject: Merge branch 'ml/maint-grep-doc' X-Git-Tag: v1.7.1-rc0~81 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3fea3139c252298f6d79a405f889f05859b9c47d;p=git.git Merge branch 'ml/maint-grep-doc' * ml/maint-grep-doc: grep docs: document --no-index option grep docs: --cached and <tree>... are incompatible grep docs: use AsciiDoc literals consistently grep docs: pluralize "Example" section --- 3fea3139c252298f6d79a405f889f05859b9c47d diff --cc Documentation/git-grep.txt index 6305f6d82,ee506e67f..4b32322a6 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@@ -18,10 -17,11 +17,11 @@@ SYNOPSI [-z | --null] [-c | --count] [--all-match] [-q | --quiet] [--max-depth <depth>] - [--color | --no-color] + [--color[=<when>] | --no-color] [-A <post-context>] [-B <pre-context>] [-C <context>] [-f <file>] [-e] <pattern> - [--and|--or|--not|(|)|-e <pattern>...] [<tree>...] + [--and|--or|--not|(|)|-e <pattern>...] + [--cached | --no-index | <tree>...] [--] [<pathspec>...] DESCRIPTION