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>
This commit is contained in:
SZEDER Gábor 2008-12-29 16:05:46 +01:00 committed by Junio C Hamano
parent ea718e65fa
commit e89e2ed7c2

View File

@ -1403,7 +1403,7 @@ _git_reset ()
local cur="${COMP_WORDS[COMP_CWORD]}" local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in case "$cur" in
--*) --*)
__gitcomp "--mixed --hard --soft" __gitcomp "--merge --mixed --hard --soft"
return return
;; ;;
esac esac