git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] rebase -i: improve advice on bad instruction lines

From
Ralf Thielow <ralf.thielow@gmail.com>
Date
Sep 6, 2016, 18:50 UTC
Message-ID
<CAN0XMOJofQwsPJvoHLZJ-fT6SudtquatYV=GwpGb6FkF4aXcxg@mail.gmail.com>
In-Reply-To
<20160906180838.865-1-ralf.thielow@gmail.com>
2016-09-06 20:08 GMT+02:00 Ralf Thielow <ralf.thielow@gmail.com>:
> -               warn "$(gettext "You can fix this with 'git rebase --edit-todo'.")"
> +               warn "$(gettext "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.")"
>                 die "$(gettext "Or you can abort the rebase with 'git rebase --abort'.")"

Please don't apply as is. There are some test failures due to the text change. I'll send an updated version.

Previous: Ralf ThielowNext: Ralf Thielow
Message 2 of 7 in “rebase -i: improve advice on bad instruction lines”
  1. rebase -i: improve advice on bad instruction linesRalf Thielow, Sep 6, 2016
  2. Ralf ThielowSep 6, 2016
  3. rebase -i: improve advice on bad instruction linesRalf Thielow, Sep 6, 2016
  4. Dennis KaarsemakerSep 7, 2016
  5. Ralf ThielowSep 7, 2016
  6. Johannes SchindelinSep 9, 2016
  7. Junio C HamanoSep 7, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.