Junio C Hamano 299deeac8a 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

2020-09-29 14:01:22 -07:00

30 KiB

Raw Blame History

View Raw