| commit | 702e6fa445b6c682ff2f3812fc965dfcb9da83c9 | |
| author | Stefan Sperling <stsp@stsp.name> | |
| Sun, 16 Jun 2024 07:39:17 +0000 (16 07:39 +0000) | ||
| committer | Thomas Adam <thomas.adam22@gmail.com> | |
| Tue, 18 Jun 2024 20:20:12 +0000 (18 21:20 +0100) | ||
| tree | 9bcfdccb422040c38bff410998370c99e0f26100 | treesnapshot (tar.gz zip) |
| parent | da165977d65c74af18c41b44f93df986324a66fe | commitdiff |
tweak the error message shown by 'got send' when ancestry has diverged
The previous message steered users towards rebase; nowadays we also have
a merge command and send -f. It's tricky to explain all possibilities of
what to do next in a single line, but this is probably better than nothing.
The previous message steered users towards rebase; nowadays we also have
a merge command and send -f. It's tricky to explain all possibilities of
what to do next in a single line, but this is probably better than nothing.
| lib/error.c | diffblobblamehistory | |
| regress/cmdline/send.sh | diffblobblamehistory |