| commit | 2071fb015bc673d2514142d7614b56a37b3faaf2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Apr 2011 22:02:01 +0000 (4 15:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 4 Apr 2011 22:02:01 +0000 (4 15:02 -0700) | ||
| tree | 8bd133ee781324212c8ebc395178d20707082ae2 | treesnapshot (tar.gz zip) |
| parent | 2c320e71bfae3d2972d41680a04b78cbd42cb941 | commitdiff |
| parent | 794a3592ad9d8a9b273f6496052bbcb46b1924ed | commitdiff |
Merge branch 'jl/submodule-fetch-on-demand'
* jl/submodule-fetch-on-demand:
fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
submodule update: Don't fetch when the submodule commit is already present
fetch/pull: Don't recurse into a submodule when commits are already present
Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
config: teach the fetch.recurseSubmodules option the 'on-demand' value
fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
fetch/pull: recurse into submodules when necessary
Conflicts:
builtin/fetch.c
submodule.c
* jl/submodule-fetch-on-demand:
fetch/pull: Describe --recurse-submodule restrictions in the BUGS section
submodule update: Don't fetch when the submodule commit is already present
fetch/pull: Don't recurse into a submodule when commits are already present
Submodules: Add 'on-demand' value for the 'fetchRecurseSubmodule' option
config: teach the fetch.recurseSubmodules option the 'on-demand' value
fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
fetch/pull: recurse into submodules when necessary
Conflicts:
builtin/fetch.c
submodule.c