merge, pull: introduce '--(no-)stat' option

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4d81963b1d00b1b4e874330a9e5933111f491def..0f54cfd8a37d05281eea5652ceefd61431d9581b 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -779,7 +779,7 @@ _git_merge ()
                ;;
        --*)
                __gitcomp "
-                       --no-commit --no-summary --squash --strategy
+                       --no-commit --no-stat --squash --strategy
                        "
                return
        esac