From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Aug 2017 21:33:47 +0000 (-0700)
Subject: Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanup
X-Git-Tag: v2.15.0-rc0~120^2~16
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=dcc6108c3fca6ad3cc4e211a939e8de5c796fa68;p=git.git

Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanup

* bw/grep-recurse-submodules:
  grep: recurse in-process using 'struct repository'
  submodule: merge repo_read_gitmodules and gitmodules_config
  submodule: check for unmerged .gitmodules outside of config parsing
  submodule: check for unstaged .gitmodules outside of config parsing
  submodule: remove fetch.recursesubmodules from submodule-config parsing
  submodule: remove submodule.fetchjobs from submodule-config parsing
  config: add config_from_gitmodules
  cache.h: add GITMODULES_FILE macro
  repository: have the_repository use the_index
  repo_read_index: don't discard the index
---

dcc6108c3fca6ad3cc4e211a939e8de5c796fa68