| commit | bed1524e0476ec9f168483646be938cb0d455c2f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 26 Jan 2024 16:54:45 +0000 (26 08:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 26 Jan 2024 16:54:45 +0000 (26 08:54 -0800) | ||
| tree | 9ccd73ae15e2eda0bb63c6e73de3e791afa52020 | treesnapshot (tar.gz zip) |
| parent | 951eafe36fcb1c14851e6b51302cc0bad51fc046 | commitdiff |
| parent | bec9bb4b3918d2b3c7b91bbb116a667d5d6d298d | commitdiff |
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
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