Merge branch 'ml/maint-grep-doc' into maint
commit193c7aaf5f17116f5e3e2449326fd9f6cdfc062d
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:36:01 +0000 (8 00:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:36:01 +0000 (8 00:36 -0800)
tree55f17fef6c4cc1106a15c12f13bed0b7157cea37
parent57c118c268a01b00954916e344f2eb082eafaaaf
parent2e48fcdbc45eeb95b3da1cf70787ddadf62d9bf5
Merge branch 'ml/maint-grep-doc' into maint

* 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