X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fcompletion%2Fgit-completion.bash;h=16984632d984006e2f2867a26714086bf3045ca3;hb=2855e70ad11abf7e7f30f975b063bd60d5abdf4f;hp=23db664f48057b7fa778f0b265510d5b95457c16;hpb=d576c45aae8479e6a50ae183e3a6ef4d6b42489f;p=git.git

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 23db664f4..16984632d 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -780,7 +780,7 @@ _git_merge ()
 		;;
 	--*)
 		__gitcomp "
-			--no-commit --no-summary --squash --strategy
+			--no-commit --no-stat --log --no-log --squash --strategy
 			"
 		return
 	esac