From: SZEDER Gábor <szeder@ira.uka.de>
Date: Mon, 29 Dec 2008 15:05:46 +0000 (+0100)
Subject: bash: add '--merge' to 'git reset'
X-Git-Tag: v1.6.2-rc0~195
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e89e2ed7c225cf16cffbd9648895528e471e2fb8;p=git.git

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>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e00454983..3b25d4809 100755
--- 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