From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Mar 2020 00:11:21 +0000 (-0700)
Subject: Merge branch 'ah/force-pull-rebase-configuration'
X-Git-Tag: v2.27.0-rc0~150
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c56d6f57adebf2a0ac910ca62a940dc7820bb68;p=thirdparty%2Fgit.git

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

1c56d6f57adebf2a0ac910ca62a940dc7820bb68