Commit e89e2ed7 authored by SZEDER Gábor's avatar SZEDER Gábor Committed by Junio C Hamano

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

Signed-off-by: default avatarSZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent ea718e65
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment