From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Sep 2020 21:01:22 +0000 (-0700)
Subject: Merge branch 'ah/pull'
X-Git-Tag: v2.29.0-rc0~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=299deeac8a67ef80989b86a75b012be1d2193bf9;p=thirdparty%2Fgit.git

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
---

299deeac8a67ef80989b86a75b012be1d2193bf9