Merge branch 'rj/advice-delete-branch-not-fully-merged' into rj/advice-disable-how...
commit8cf646faac355fb44199793fe1a080b82abffc29
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Jan 2024 21:06:35 +0000 (16 13:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Jan 2024 21:06:35 +0000 (16 13:06 -0800)
tree4de43a7fbb7d1443980368f5972957c0850b0904
parenta54a84b333adbecf7bc4483c0e36ed5878cac17b
parentbec9bb4b3918d2b3c7b91bbb116a667d5d6d298d
Merge branch 'rj/advice-delete-branch-not-fully-merged' into rj/advice-disable-how-to-disable

* 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