Merge branch 'sb/pull-rebase-submodule'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 18:33:54 +0000 (11:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 18:33:54 +0000 (11:33 -0700)
"git pull --rebase -v" in a repository with a submodule barfed as
an intermediate process did not understand what "-v(erbose)" flag
meant, which has been fixed.

* sb/pull-rebase-submodule:
  git-submodule.sh: accept verbose flag in cmd_update to be non-quiet

git-submodule.sh

index 8b5ad59..f7fd803 100755 (executable)
@@ -438,6 +438,9 @@ cmd_update()
                -q|--quiet)
                        GIT_QUIET=1
                        ;;
+               -v)
+                       GIT_QUIET=0
+                       ;;
                --progress)
                        progress=1
                        ;;