From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Jan 2021 07:33:44 +0000 (-0800)
Subject: Merge branch 'fc/pull-merge-rebase'
X-Git-Tag: v2.31.0-rc0~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3fa84d52873cdf3852e41b684ab93475fe4424f;p=thirdparty%2Fgit.git

Merge branch 'fc/pull-merge-rebase'

When a user does not tell "git pull" to use rebase or merge, the
command gives a loud message telling a user to choose between
rebase or merge but creates a merge anyway, forcing users who would
want to rebase to redo the operation.  Fix an early part of this
problem by tightening the condition to give the message---there is
no reason to stop or force the user to choose between rebase or
merge if the history fast-forwards.

* fc/pull-merge-rebase:
  pull: display default warning only when non-ff
  pull: correct condition to trigger non-ff advice
  pull: get rid of unnecessary global variable
  pull: give the advice for choosing rebase/merge much later
  pull: refactor fast-forward check
---

d3fa84d52873cdf3852e41b684ab93475fe4424f