diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-20 03:20:12 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-20 03:20:12 +0300 |
| commit | 7102eb6b794f3d65433146ebbab6f81e8460d0ae (patch) | |
| tree | 70ec85b7be57f32a98a47dd326ba2a5e36945a21 /reftable/stack.c | |
| parent | 8c6e9c07ef0bd922be435c0763b0b1b5bc508796 (diff) | |
| parent | bec9bb4b3918d2b3c7b91bbb116a667d5d6d298d (diff) | |
Merge branch 'rj/advice-delete-branch-not-fully-merged' into next
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 'reftable/stack.c')
0 files changed, 0 insertions, 0 deletions