From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Apr 2020 20:42:47 +0000 (-0700)
Subject: Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'
X-Git-Tag: v2.27.0-rc0~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfdce31ce6c9c4d7266031ea70f982e7f22bb525;p=thirdparty%2Fgit.git

Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'

"git pull --rebase" tried to run a rebase even after noticing that
the pull results in a fast-forward and no rebase is needed nor
sensible, for the past few years due to a mistake nobody noticed.

* en/pull-do-not-rebase-after-fast-forwarding:
  pull: avoid running both merge and rebase
---

dfdce31ce6c9c4d7266031ea70f982e7f22bb525