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>
SZEDER Gábor committed
Dec 29, 2008 at 16:05 UTC
e89e2ed7c225cf16cffbd9648895528e471e2fb8
1 file changed
+1
-1
contrib/completion/git-completion.bash
+1
-1
@@ -1403,7 +1403,7 @@ _git_reset ()
1403
local cur="${COMP_WORDS[COMP_CWORD]}"
1404
case "$cur" in
1405
--*)
1406
- __gitcomp "--mixed --hard --soft"
1406
+ __gitcomp "--merge --mixed --hard --soft"
1407
return
1408
;;
1409
esac