The error message we show when the user tries to delete a not fully merged branch describes the error and gives a hint to the user: error: the branch 'foo' is not fully merged. If you are sure you want to delete it, run 'git branch -D foo'. Let's move the hint part so that it is displayed using the advice machinery: error: the branch 'foo' is not fully merged hint: If you are sure you want to delete it, run 'git branch -D foo' hint: Disable this message with "git config advice.forceDeleteBranch false" Rubén Justo (3): advice: sort the advice related lists advice: fix an unexpected leading space branch: make the advice to force-deleting a conditional one Documentation/config/advice.txt | 157 ++++++++++++++++---------------- advice.c | 14 ++- advice.h | 15 +-- builtin/branch.c | 8 +- 4 files changed, 99 insertions(+), 95 deletions(-) -- 2.42.0
