merge, pull: add '--(no-)log' command line option

[~andy/git] / contrib / completion / git-completion.bash

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