Merge branch 'bl/gitweb-project-filter'

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e44eefdf1c55198351cf1e73de976aba701cd49d..a2965f7c6da087acc60b901befe2529a44446647 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1622,7 +1622,7 @@ _git_log ()
 
 __git_merge_options="
        --no-commit --no-stat --log --no-log --squash --strategy
-       --commit --stat --no-squash --ff --no-ff --ff-only
+       --commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit
 "
 
 _git_merge ()