Merge branch 'jc/grep-untracked-exclude'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:23 +0000 (19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Oct 2011 02:03:23 +0000 (19:03 -0700)
commitab1e76b88c836b16f37083910a4b1844fb4ddaca
tree1c4363d4f2139c0e6d6315bf951d5da92190075f
parent7a63a920fd9842f0ccb7a88c8df7652d905fc1ec
parentdbfae86a7b0bf9f9a4f37dbc916e8d26a5f9d51c
Merge branch 'jc/grep-untracked-exclude'

* jc/grep-untracked-exclude:
  grep: teach --untracked and --exclude-standard options
builtin/grep.c