From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Jan 2024 16:54:45 +0000 (-0800)
Subject: Merge branch 'rj/advice-delete-branch-not-fully-merged'
X-Git-Tag: v2.44.0-rc0~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bed1524e0476ec9f168483646be938cb0d455c2f;p=thirdparty%2Fgit.git

Merge branch 'rj/advice-delete-branch-not-fully-merged'

The error message given when "git branch -d branch" fails due to
commits unique to the branch has been split into an error and a new
conditional advice message.

* rj/advice-delete-branch-not-fully-merged:
  branch: make the advice to force-deleting a conditional one
  advice: fix an unexpected leading space
  advice: sort the advice related lists
---

bed1524e0476ec9f168483646be938cb0d455c2f