From 54200cef86a67ea6666d02be7f21e66d471624bf Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Thu, 24 Sep 2020 21:50:23 -0600 Subject: 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 Signed-off-by: Junio C Hamano --- builtin/pull.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'builtin/pull.c') 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" -- cgit v1.2.3