aboutsummaryrefslogtreecommitdiffstats
path: root/commit-graph.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-01-26 08:54:45 -0800
committerJunio C Hamano <gitster@pobox.com>2024-01-26 08:54:45 -0800
commitbed1524e0476ec9f168483646be938cb0d455c2f (patch)
tree9ccd73ae15e2eda0bb63c6e73de3e791afa52020 /commit-graph.c
parentMerge branch 'es/some-up-to-date-messages-must-stay' (diff)
parentbranch: make the advice to force-deleting a conditional one (diff)
downloadgit-bed1524e0476ec9f168483646be938cb0d455c2f.tar.gz
git-bed1524e0476ec9f168483646be938cb0d455c2f.zip
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
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions