projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a35d78c 2cd9de3)
Merge branch 'jc/submodule-sync-no-auto-vivify' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:41:26 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:41:26 +0000 (11:41 -0700)
* jc/submodule-sync-no-auto-vivify:
  submodule add: always initialize .git/config entry
  submodule sync: do not auto-vivify uninteresting submodule

1  2 
Documentation/git-submodule.txt patch | diff1 | diff2 | blob | history
git-submodule.sh patch | diff1 | diff2 | blob | history
t/t7403-submodule-sync.sh patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-submodule.txt
Simple merge
diff --cc git-submodule.sh
Simple merge
diff --cc t/t7403-submodule-sync.sh
Simple merge
Git—the stupid content tracker