config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag

[thirdparty/git.git] / git-submodule.sh

diff --git a/git-submodule.sh b/git-submodule.sh
index 6fb12585cb07c3eb1f0a9ff1263c8d51de26962c..7ce52872b721d0db8f6c7c68a25ec0b0978c4366 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -440,7 +440,7 @@ cmd_update()
                        GIT_QUIET=1
                        ;;
                -v)
-                       GIT_QUIET=0
+                       unset GIT_QUIET
                        ;;
                --progress)
                        progress=1
@@ -614,13 +614,13 @@ cmd_update()
                                say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")"
                                ;;
                        rebase)
-                               command="git rebase"
+                               command="git rebase ${GIT_QUIET:+--quiet}"
                                die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")"
                                say_msg="$(eval_gettext "Submodule path '\$displaypath': rebased into '\$sha1'")"
                                must_die_on_failure=yes
                                ;;
                        merge)
-                               command="git merge"
+                               command="git merge ${GIT_QUIET:+--quiet}"
                                die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")"
                                say_msg="$(eval_gettext "Submodule path '\$displaypath': merged in '\$sha1'")"
                                must_die_on_failure=yes