Merge branch 'jk/rerere-forget-check-enabled' into maint

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index fbe597232c11c05c1b8f9c366232d52f050b8d51..eae9dce590e0000eb93e441106ef6538c07e86cc 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -186,7 +186,7 @@ fi
 
 __gitcompappend ()
 {
-       local i=${#COMPREPLY[@]}
+       local x i=${#COMPREPLY[@]}
        for x in $1; do
                if [[ "$x" == "$3"* ]]; then
                        COMPREPLY[i++]="$2$x$4"
@@ -1448,7 +1448,7 @@ _git_log ()
                return
                ;;
        --decorate=*)
-               __gitcomp "long short" "" "${cur##--decorate=}"
+               __gitcomp "full short no" "" "${cur##--decorate=}"
                return
                ;;
        --*)