Merge branch 'jc/submodule-sync-no-auto-vivify'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2011 16:45:37 +0000 (09:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2011 16:45:37 +0000 (09:45 -0700)
commit0591c0a5be7d58dfe2c69c8a81b2cebbb0337320
tree78bdfd99a808beaedbdb9bb055e2e693b0dfaa68
parent765c7e4f3100484ea277f043048631ea93b3127a
parent2cd9de3e18183422cd7ec3cd81cebc656068ea42
Merge branch 'jc/submodule-sync-no-auto-vivify'

* jc/submodule-sync-no-auto-vivify:
  submodule add: always initialize .git/config entry
  submodule sync: do not auto-vivify uninteresting submodule

Conflicts:
git-submodule.sh
Documentation/git-submodule.txt
git-submodule.sh
t/t7403-submodule-sync.sh