Merge branch 'pt/pull-ff-vs-merge-ff' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5944c824abe9aa4dee8b63b0e91a047125722b22..eae9dce590e0000eb93e441106ef6538c07e86cc 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1448,7 +1448,7 @@ _git_log ()
                return
                ;;
        --decorate=*)
-               __gitcomp "long short" "" "${cur##--decorate=}"
+               __gitcomp "full short no" "" "${cur##--decorate=}"
                return
                ;;
        --*)