tree cfc3ad84c4c300498b6aaf65cfb40ac823496d69
parent ac4089da7bcf63698c239a16076a144e66de96a9
parent 54200cef86a67ea6666d02be7f21e66d471624bf
author Junio C Hamano <gitster@pobox.com> 1601413282 -0700
committer Junio C Hamano <gitster@pobox.com> 1601413282 -0700

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