# [PATCH] bash: add '--merge' to 'git reset' 2 messages from 2008-12-29 to 2009-01-06. Participants: SZEDER Gábor, Junio C Hamano. Thread: https://gitlist.dev/t/16909 ## SZEDER Gábor, 2008-12-29 15:05 Subject: [PATCH] bash: add '--merge' to 'git reset' Message-ID: <1230563146-18958-1-git-send-email-szeder@ira.uka.de> URL: https://gitlist.dev/e/1230563146-18958-1-git-send-email-szeder%40ira.uka.de ``` Signed-off-by: SZEDER Gábor --- 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 ``` ## Junio C Hamano, 2009-01-06 08:18 Subject: Re: [PATCH] bash: add '--merge' to 'git reset' Message-ID: <7vmye4luf3.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vmye4luf3.fsf%40gitster.siamese.dyndns.org In-Reply-To: <1230563146-18958-1-git-send-email-szeder@ira.uka.de> ``` Thanks; applied. ```