diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 09:59:57 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 09:59:58 +0900 |
| commit | b0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8 (patch) | |
| tree | d07202c20257da961faf1f9a2d4852371c0289ca /builtin/pull.c | |
| parent | Merge branch 'ab/receive-pack-use-after-free-fix' (diff) | |
| parent | completion: add more parameter value completion (diff) | |
| download | git-b0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8.tar.gz git-b0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8.zip | |
Merge branch 'nd/completion-more-parameters'
The command line completion (in contrib/) has been taught to
complete more subcommand parameters.
* nd/completion-more-parameters:
completion: add more parameter value completion
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 701d1473dc..33db889955 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -56,6 +56,10 @@ static enum rebase_type parse_config_rebase(const char *key, const char *value, return REBASE_MERGES; else if (!strcmp(value, "interactive") || !strcmp(value, "i")) return REBASE_INTERACTIVE; + /* + * Please update _git_config() in git-completion.bash when you + * add new rebase modes. + */ if (fatal) die(_("Invalid value for %s: %s"), key, value); |