From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Nov 2021 23:01:19 +0000 (-0800)
Subject: Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date'
X-Git-Tag: v2.34.0~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c7cf62c485f527bee6d3eb7e37dcfbf8064cab2;p=thirdparty%2Fgit.git

Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date'

"git pull --ff-only" and "git pull --rebase --ff-only" should make
it a no-op to attempt pulling from a remote that is behind us, but
instead the command errored out by saying it was impossible to
fast-forward, which may technically be true, but not a useful thing
to diagnose as an error.  This has been corrected.

* jc/fix-pull-ff-only-when-already-up-to-date:
  pull: --ff-only should make it a noop when already-up-to-date
---

7c7cf62c485f527bee6d3eb7e37dcfbf8064cab2