Merge branch 'jl/fetch-submodule-recursive' into next
commit676c4f5b369e44fcdeb8187eb127848bb8042565
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:24 +0000 (8 12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:24 +0000 (8 12:25 -0800)
treec2c740c897bd5d7bb9c039c80c438cc4b960b8bc
parent94debb8374c6d956221ceb71492d175e5c8fa3f3
parentc1a3c3640deb8bd6929026a55b18feb1dda74e77
Merge branch 'jl/fetch-submodule-recursive' into next

* jl/fetch-submodule-recursive:
  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