![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Oct 2011 01:40:41 +0000 (18:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Oct 2011 01:40:41 +0000 (18:40 -0700) | ||
| commit | dbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c | |
| tree | d3f094e8c3d559f6efdeca927b613c8535cb7699 | tree | snapshot |
| parent | 703f05ad5835cff92b12c29aecf8d724c8c847e2 | commit | diff |
| parent | 0a93fb8a9cc6fa1bf7dba6b498cba3f57f5017a1 | commit | diff |
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
* 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
| Documentation/git-grep.txt | diff1 | | diff2 | | blob | history |
| builtin/grep.c | diff1 | | | | blob | history |
| t/t7810-grep.sh | diff1 | | | | blob | history |