* [PATCH] bash: add '--merge' to 'git reset'
@ 2008-12-29 15:05 SZEDER Gábor
2009-01-06 8:18 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: SZEDER Gábor @ 2008-12-29 15:05 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, SZEDER Gábor
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
contrib/completion/git-completion.bash | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3491fd0..f6c3755 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1408,7 +1408,7 @@ _git_reset ()
local cur="${COMP_WORDS[COMP_CWORD]}"
case "$cur" in
--*)
- __gitcomp "--mixed --hard --soft"
+ __gitcomp "--merge --mixed --hard --soft"
return
;;
esac
--
1.6.1.57.gdceb8
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] bash: add '--merge' to 'git reset'
2008-12-29 15:05 [PATCH] bash: add '--merge' to 'git reset' SZEDER Gábor
@ 2009-01-06 8:18 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2009-01-06 8:18 UTC (permalink / raw)
To: SZEDER Gábor; +Cc: Shawn O. Pearce, git
Thanks; applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-01-06 8:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-29 15:05 [PATCH] bash: add '--merge' to 'git reset' SZEDER Gábor
2009-01-06 8:18 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).