X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=4e9e0e49ecf2532ac8af1bfd46033e68c6f1042d;hb=57756161eed50f2b52c9e32b01f6388814a09943;hp=63b063a7b284bac5b10a9bd6fe879e5717bee2f3;hpb=785d6989dac6a61eabdc06c781ee0f47d10f36c0;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 63b063a7b..4e9e0e49e 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
 		;;
@@ -274,7 +277,7 @@ esac
 if test -z "$orig_head"
 then
 	git update-ref -m "initial pull" HEAD $merge_head "$curr_head" &&
-	git read-tree --reset -u HEAD || exit 1
+	git read-tree -m -u HEAD || exit 1
 	exit
 fi