diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-09-29 14:01:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-29 14:01:22 -0700 |
| commit | 299deeac8a67ef80989b86a75b012be1d2193bf9 (patch) | |
| tree | cfc3ad84c4c300498b6aaf65cfb40ac823496d69 /builtin | |
| parent | Merge branch 'tg/range-diff-same-file-fix' (diff) | |
| parent | pull: don't warn if pull.ff has been set (diff) | |
| download | tgif-299deeac8a67ef80989b86a75b012be1d2193bf9.tar.xz | |
Merge branch 'ah/pull'
Earlier we taught "git pull" to warn when the user does not say the
histories need to be merged, rebased or accepts only fast-
forwarding, but the warning triggered for those who have set the
pull.ff configuration variable.
* ah/pull:
pull: don't warn if pull.ff has been set
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 015f6ded0b..425950f469 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -344,8 +344,7 @@ static enum rebase_type config_get_rebase(void) if (!git_config_get_value("pull.rebase", &value)) return parse_config_rebase("pull.rebase", value, 1); - if (opt_verbosity >= 0 && - (!opt_ff || strcmp(opt_ff, "--ff-only"))) { + if (opt_verbosity >= 0 && !opt_ff) { warning(_("Pulling without specifying how to reconcile divergent branches is\n" "discouraged. You can squelch this message by running one of the following\n" "commands sometime before your next pull:\n" |