summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-04 22:02:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-04 22:02:01 (GMT)
commit2071fb015bc673d2514142d7614b56a37b3faaf2 (patch)
tree8bd133ee781324212c8ebc395178d20707082ae2 /git-pull.sh
parent2c320e71bfae3d2972d41680a04b78cbd42cb941 (diff)
parent794a3592ad9d8a9b273f6496052bbcb46b1924ed (diff)
downloadgit-2071fb015bc673d2514142d7614b56a37b3faaf2.zip
git-2071fb015bc673d2514142d7614b56a37b3faaf2.tar.gz
git-2071fb015bc673d2514142d7614b56a37b3faaf2.tar.bz2
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
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-pull.sh b/git-pull.sh
index e31226b..4e9e0e4 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -110,6 +110,9 @@ do
--recurse-submodules)
recurse_submodules=--recurse-submodules
;;
+ --recurse-submodules=*)
+ recurse_submodules="$1"
+ ;;
--no-recurse-submodules)
recurse_submodules=--no-recurse-submodules
;;