Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
bash: add '--merge' to 'git reset'
author
SZEDER Gábor
<szeder@ira.uka.de>
Mon, 29 Dec 2008 15:05:46 +0000
(16:05 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 5 Jan 2009 18:55:27 +0000
(10:55 -0800)
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
ea718e6
)
diff --git
a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index e00454983ee16624910e40fec9ddb12849110b1b..3b25d48098b99646819999bd29e64ade517419d6 100755
(executable)
--- 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 "--m
erge --m
ixed --hard --soft"
return
;;
esac