Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
completion: put matching ctags symbol names directly into COMPREPLY
[gitweb.git]
/
git-submodule.sh
diff --git
a/git-submodule.sh
b/git-submodule.sh
index 123ac104c6f312cc27f1ddf925c80b386bfd4f23..136e26a2c8d4ca1e835e2873f3fd994864dc135e 100755
(executable)
--- a/
git-submodule.sh
+++ b/
git-submodule.sh
@@
-613,7
+613,10
@@
cmd_update()
if test $just_cloned -eq 1
then
subsha1=
- update_module=checkout
+ case "$update_module" in
+ merge | rebase | none)
+ update_module=checkout ;;
+ esac
else
subsha1=$(sanitize_submodule_env; cd "$sm_path" &&
git rev-parse --verify HEAD) ||