Merge branch 'gb/maint-submodule-env'

* gb/maint-submodule-env:
  is_submodule_modified(): clear environment properly
  submodules: ensure clean environment when operating in a submodule
  shell setup: clear_local_git_env() function
  rev-parse: --local-env-vars option
  Refactor list of of repo-local env vars

diff --cc Documentation/git-rev-parse.txt
Simple merge

diff --cc builtin-rev-parse.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc connect.c
Simple merge

diff --cc git-sh-setup.sh
index 7a095665d71f153a970243a9d03d919ddef29c88,cf864a62738292cdd27d4461221369ef034516c5..6131670860514c215a6b9b7417dd05c3124e81b4
mode 100644,100755..100644
--- 1/git-sh-setup.sh
--- 2/git-sh-setup.sh
+++ b/git-sh-setup.sh

diff --cc git-submodule.sh
Simple merge