]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mt/grep-submodules-working-tree'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Aug 2019 19:34:10 +0000 (12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Aug 2019 19:34:10 +0000 (12:34 -0700)
"git grep --recurse-submodules" that looks at the working tree
files looked at the contents in the index in submodules, instead of
files in the working tree.

* mt/grep-submodules-working-tree:
  grep: fix worktree case in submodules

1  2 
builtin/grep.c
t/t7814-grep-recurse-submodules.sh

diff --cc builtin/grep.c
Simple merge
Simple merge