diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2008-12-29 16:05:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-05 10:55:27 -0800 |
| commit | e89e2ed7c225cf16cffbd9648895528e471e2fb8 (patch) | |
| tree | a40086c37561b0218fdfd1196b920e268be92bff /contrib | |
| parent | ea718e65fab17297a8a9dbebf63ae99096e9537a (diff) | |
| download | git-e89e2ed7c225cf16cffbd9648895528e471e2fb8.tar.gz git-e89e2ed7c225cf16cffbd9648895528e471e2fb8.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | 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 e00454983..3b25d4809 100755 --- 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 "--merge --mixed --hard --soft" return ;; esac |