tree c9fc0788d428a225cfa41d6f666de7dea369e0ee
parent 369ae7567a4621aa81e5c4decc27715418564ac2
parent d18c950a69f3a24e1e3add3d9fc427641f53e12b
author Junio C Hamano <gitster@pobox.com> 1585267881 -0700
committer Junio C Hamano <gitster@pobox.com> 1585267881 -0700

Merge branch 'ah/force-pull-rebase-configuration'

"git pull" learned to warn when no pull.rebase configuration
exists, and neither --[no-]rebase nor --ff-only is given (which
would result a merge).

* ah/force-pull-rebase-configuration:
  pull: warn if the user didn't say whether to rebase or to merge