diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-03-07 01:05:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-07 19:02:48 (GMT) |
| commit | b475e442e8ec64e77acd7cb8c9c9bb321a76e82d (patch) | |
| tree | 81cca01f4f6a84a6c57765f905cf5c0f8a991ee3 /contrib | |
| parent | fc3d4e0cbe65639509c765726fe01a16575e9ae8 (diff) | |
| download | git-b475e442e8ec64e77acd7cb8c9c9bb321a76e82d.zip git-b475e442e8ec64e77acd7cb8c9c9bb321a76e82d.tar.gz git-b475e442e8ec64e77acd7cb8c9c9bb321a76e82d.tar.bz2 | |
completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate
There is not a strong reason to hide this option, and git-merge already
completes this one. Let's allow to complete this for all commands (and
let git-completion.bash do the suppressing if needed).
This makes --rerere-autoupdate completable for am, cherry-pick and
revert. rebase completion is fixed manually because it's a shell
script and does not benefit from --git-completion-helper.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0ddf400..0d858ca 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1754,8 +1754,7 @@ _git_merge () case "$cur" in --*) - __gitcomp_builtin merge "--rerere-autoupdate - --no-rerere-autoupdate + __gitcomp_builtin merge "--no-rerere-autoupdate --no-commit --no-edit --no-ff --no-log --no-progress --no-squash --no-stat @@ -1963,6 +1962,7 @@ _git_rebase () --autostash --no-autostash --verify --no-verify --keep-empty --root --force-rebase --no-ff + --rerere-autoupdate --exec " |