summaryrefslogtreecommitdiff
path: root/builtin/pull.c
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2020-09-25 03:50:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-25 06:04:27 (GMT)
commit54200cef86a67ea6666d02be7f21e66d471624bf (patch)
treeb4565117720655c023e7d4fb49a2525dc7baa61d /builtin/pull.c
parentb3d7a52fac39193503a0b6728771d1bf6a161464 (diff)
downloadgit-54200cef86a67ea6666d02be7f21e66d471624bf.zip
git-54200cef86a67ea6666d02be7f21e66d471624bf.tar.gz
git-54200cef86a67ea6666d02be7f21e66d471624bf.tar.bz2
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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 00e5857..0f71eca 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"