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>
git-mirror · Jan 5, 2009 · e89e2ed · e89e2ed
1 parent ea718e6
commit e89e2ed
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1403,7 +1403,7 @@ _git_reset ()
 	local cur="${COMP_WORDS[COMP_CWORD]}"
 	case "$cur" in
 	--*)
-		__gitcomp "--mixed --hard --soft"
+		__gitcomp "--merge --mixed --hard --soft"
 		return
 		;;
 	esac