author | Junio C Hamano <gitster@pobox.com> | |
Tue, 19 Jul 2011 16:45:37 +0000 (09:45 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 19 Jul 2011 16:45:37 +0000 (09:45 -0700) | ||
commit | 0591c0a5be7d58dfe2c69c8a81b2cebbb0337320 | |
tree | 78bdfd99a808beaedbdb9bb055e2e693b0dfaa68 | tree | snapshot |
parent | 765c7e4f3100484ea277f043048631ea93b3127a | commit | diff |
parent | 2cd9de3e18183422cd7ec3cd81cebc656068ea42 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |
git-submodule.sh | diff1 | | diff2 | | blob | history |
t/t7403-submodule-sync.sh | diff1 | | diff2 | | blob | history |