]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 951eafe bec9bb4)
Merge branch 'rj/advice-delete-branch-not-fully-merged'
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Jan 2024 16:54:45 +0000 (08:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Jan 2024 16:54:45 +0000 (08:54 -0800)
commitbed1524e0476ec9f168483646be938cb0d455c2f
tree9ccd73ae15e2eda0bb63c6e73de3e791afa52020tree | snapshot
parent951eafe36fcb1c14851e6b51302cc0bad51fc046commit | diff
parentbec9bb4b3918d2b3c7b91bbb116a667d5d6d298dcommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.