Code

Merge branch 'jl/fetch-submodule-recursive'
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 20:57:15 +0000 (12:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 20:57:15 +0000 (12:57 -0800)
commit4bb4d30095fbc3b1689cc656e71f6a51e43fbd69
tree2865af7e033d5aee40cb589fe8ad8bdfa6d8b143
parentb5c6aac01baf9164e08915b348490710e83119f9
parent1c1f3537c0283c92abbca9155813ed62b05cb481
Merge branch 'jl/fetch-submodule-recursive'

* jl/fetch-submodule-recursive:
  fetch_populated_submodules(): document dynamic allocation
  Submodules: Add the "fetchRecurseSubmodules" config option
  Add the 'fetch.recurseSubmodules' config setting
  fetch/pull: Add the --recurse-submodules option

Conflicts:
builtin/fetch.c
Documentation/config.txt
Documentation/fetch-options.txt
builtin/fetch.c
git-pull.sh