Merge branch 'gb/maint-submodule-env'
authorJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 20:47:17 +0000 (12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 7 Mar 2010 20:47:17 +0000 (12:47 -0800)
* 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

1  2 
Documentation/git-rev-parse.txt
builtin-rev-parse.c
cache.h
connect.c
git-sh-setup.sh
git-submodule.sh

Simple merge
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
Simple merge