summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-20 18:33:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-20 18:33:54 (GMT)
commitce9c6a3c78bc2e2ebbe5f3351a2623d6101985f8 (patch)
treec6726c95280c6220f16932efa773a44024615efb /git-submodule.sh
parent81eab6871e03869a8e47799c10ec1e1cb95ca34a (diff)
parente84c3cf3dc3c3140d317f7ed0b18768adbec0401 (diff)
downloadgit-ce9c6a3c78bc2e2ebbe5f3351a2623d6101985f8.zip
git-ce9c6a3c78bc2e2ebbe5f3351a2623d6101985f8.tar.gz
git-ce9c6a3c78bc2e2ebbe5f3351a2623d6101985f8.tar.bz2
Merge branch 'sb/pull-rebase-submodule'
"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
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 8b5ad59..f7fd803 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -438,6 +438,9 @@ cmd_update()
-q|--quiet)
GIT_QUIET=1
;;
+ -v)
+ GIT_QUIET=0
+ ;;
--progress)
progress=1
;;