From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Oct 2011 01:40:41 +0000 (-0700)
Subject: Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude
X-Git-Tag: v1.7.8-rc0~78^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c?hp=dbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c

Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

* jc/maint-grep-untracked-exclude:
grep: teach --untracked and --exclude-standard options
grep --no-index: don't use git standard exclusions
grep: do not use --index in the short usage output

Conflicts:
Documentation/git-grep.txt
builtin/grep.c
---