commit e89e2ed7c225cf16cffbd9648895528e471e2fb8
author SZEDER Gábor <szeder@ira.uka.de> Mon Dec 29 16:05:46 2008 +0100
committer Junio C Hamano <gitster@pobox.com> Mon Jan 05 10:55:27 2009 -0800
tree a40086c37561b0218fdfd1196b920e268be92bff
parent ea718e65fab17297a8a9dbebf63ae99096e9537a

bash: add '--merge' to 'git reset'

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

contrib/completion/git-completion.bash

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e004549..3b25d48 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1403,7 +1403,7 @@
 	local cur="${COMP_WORDS[COMP_CWORD]}"
 	case "$cur" in
 	--*)
-		__gitcomp "--mixed --hard --soft"
+		__gitcomp "--merge --mixed --hard --soft"
 		return
 		;;
 	esac