diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 11:33:54 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 11:33:54 -0700 |
commit | ce9c6a3c78bc2e2ebbe5f3351a2623d6101985f8 (patch) | |
tree | c6726c95280c6220f16932efa773a44024615efb /git-submodule.sh | |
parent | Merge branch 'js/range-diff' (diff) | |
parent | git-submodule.sh: accept verbose flag in cmd_update to be non-quiet (diff) | |
download | tgif-ce9c6a3c78bc2e2ebbe5f3351a2623d6101985f8.tar.xz |
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-x | git-submodule.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 8b5ad59bde..f7fd80345c 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 ;; |