Merge branch 'jc/submodule-sync-no-auto-vivify' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 5 Jul 2011 22:47:35 +0000 (15:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 5 Jul 2011 22:47:35 +0000 (15:47 -0700)
commitb207ba3d98c05ff2865c76aaa068ca3a8e411b88
treef238275b006cd844f143e96350655f3963c676f7
parentdf3f3d8773c231ae9cad32bedb5927d4b5f943df
parent2cd9de3e18183422cd7ec3cd81cebc656068ea42
Merge branch 'jc/submodule-sync-no-auto-vivify' into next

* 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