From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 Mar 2023 22:03:12 +0000 (-0700)
Subject: Merge branch 'fc/advice-diverged-history'
X-Git-Tag: v2.41.0-rc0~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9de14c71f720b1da50c95309fc06d30c8455aae2;p=thirdparty%2Fgit.git

Merge branch 'fc/advice-diverged-history'

After "git pull" that is configured with pull.rebase=false
merge.ff=only fails due to our end having our own development, give
advice messages to get out of the "Not possible to fast-forward"
state.

* fc/advice-diverged-history:
  advice: add diverging advice for novices
---

9de14c71f720b1da50c95309fc06d30c8455aae2