diff options
| author |  Alex Henrie <alexhenrie24@gmail.com> | 2020-09-24 21:50:23 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-09-24 23:04:27 -0700 |
| commit | 54200cef86a67ea6666d02be7f21e66d471624bf (patch) | |
| tree | b4565117720655c023e7d4fb49a2525dc7baa61d /builtin/pull.c | |
| parent | Git 2.27 (diff) | |
| download | tgif-54200cef86a67ea6666d02be7f21e66d471624bf.tar.xz | |
pull: don't warn if pull.ff has been set
A user who understands enough to set pull.ff does not need additional
instructions.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pull.c')
| -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 00e5857a8d..0f71eca468 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" |