diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-03-07 02:05:01 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-03-07 20:02:48 +0100 |
commit | b475e442e8ec64e77acd7cb8c9c9bb321a76e82d (patch) | |
tree | 81cca01f4f6a84a6c57765f905cf5c0f8a991ee3 /parse-options.h | |
parent | completion: use __gitcomp_builtin in _git_worktree (diff) | |
download | git-b475e442e8ec64e77acd7cb8c9c9bb321a76e82d.tar.xz git-b475e442e8ec64e77acd7cb8c9c9bb321a76e82d.zip |
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 'parse-options.h')
-rw-r--r-- | parse-options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parse-options.h b/parse-options.h index 0ba08691e6..ab1cc362bf 100644 --- a/parse-options.h +++ b/parse-options.h @@ -148,8 +148,8 @@ struct option { #define OPT_STRING_LIST(s, l, v, a, h) \ { OPTION_CALLBACK, (s), (l), (v), (a), \ (h), 0, &parse_opt_string_list } -#define OPT_UYN(s, l, v, h, f) { OPTION_CALLBACK, (s), (l), (v), NULL, \ - (h), PARSE_OPT_NOARG|(f), &parse_opt_tertiary } +#define OPT_UYN(s, l, v, h) { OPTION_CALLBACK, (s), (l), (v), NULL, \ + (h), PARSE_OPT_NOARG, &parse_opt_tertiary } #define OPT_DATE(s, l, v, h) \ { OPTION_CALLBACK, (s), (l), (v), N_("time"),(h), 0, \ parse_opt_approxidate_cb } |