]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
* jc/grep-untracked-exclude:
  grep: teach --untracked and --exclude-standard options

1  2 
builtin/grep.c

diff --cc builtin/grep.c
Simple merge