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

Re: [PATCH 0/3] Die preserve ggg

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
May 26, 2022, 09:54 UTC
Message-ID
<220526.86y1yo62jl.gmgdl@evledraar.gmail.com>
In-Reply-To
<pull.1242.git.1653556865.gitgitgadget@gmail.com>
On Thu, May 26 2022, Philip Oakley via GitGitGadget wrote:
Show 10 quoted lines
> This short series is a follow up to GitGitGadget "Update the die()
> preserve-merges messages to help some users (PR #1155)" [1].
>
> The first patch is a tidy up of the --preserve option to highlight that it
> is now Deleted, rather than Deprecated.
>
> In response to Avar's comments that the former error message merely
> 'tantilised without telling' the user what to do, it became obvious that the
> underling problem was that the user was unable to git rebase --abort which
> was also fatal, when a preserve-rebase was in progress.

Thanks a lot for following up on this, this all looks OK to me. I had some minor comments about maybe tweaking this & that, but as far as I'm concerned this could go in as-is, depending on whether you think it needs a re-roll in response to my comments + others.

Previous: Philip OakleyNext: Philip Oakley
Message 25 of 35 in “Die preserve ggg”
  1. 0/3 Die preserve gggPhilip Oakley via GitGitGadget, May 26, 2022
  2. 1/3 rebase.c: state preserve-merges has been removedPhilip Oakley via GitGitGadget, May 26, 2022
  3. Ævar Arnfjörð BjarmasonMay 26, 2022
  4. Philip OakleyMay 26, 2022
  5. René ScharfeMay 26, 2022
  6. Junio C HamanoMay 26, 2022
  7. René ScharfeMay 26, 2022
  8. Junio C HamanoMay 26, 2022
  9. Philip OakleyMay 27, 2022
  10. Philip OakleyMay 27, 2022
  11. Junio C HamanoMay 27, 2022
  12. Philip OakleyMay 27, 2022
  13. Ævar Arnfjörð BjarmasonMay 27, 2022
  14. 2/3 rebase: help users when dying with `preserve-merges`Philip Oakley via GitGitGadget, May 26, 2022
  15. Ævar Arnfjörð BjarmasonMay 26, 2022
  16. Philip OakleyMay 26, 2022
  17. Junio C HamanoMay 26, 2022
  18. Philip OakleyMay 27, 2022
  19. Junio C HamanoMay 27, 2022
  20. 3/3 rebase: note `preserve` merges may be a pull config optionPhilip Oakley via GitGitGadget, May 26, 2022
  21. Ævar Arnfjörð BjarmasonMay 26, 2022
  22. Philip OakleyMay 26, 2022
  23. Junio C HamanoMay 26, 2022
  24. Philip OakleyMay 27, 2022
  25. Ævar Arnfjörð BjarmasonMay 26, 2022
  26. Philip OakleyMay 26, 2022
  27. 0/4 Die preserve gggPhilip Oakley via GitGitGadget, Jun 4, 2022
  28. 3/4 rebase: note `preserve` merges may be a pull config optionPhilip Oakley via GitGitGadget, Jun 4, 2022
  29. Junio C HamanoJun 6, 2022
  30. Philip OakleyJun 11, 2022
  31. Philip OakleyJun 11, 2022
  32. Junio C HamanoJun 11, 2022
  33. 2/4 rebase: help users when dying with `preserve-merges`Philip Oakley via GitGitGadget, Jun 4, 2022
  34. 1/4 rebase.c: state preserve-merges has been removedPhilip Oakley via GitGitGadget, Jun 4, 2022
  35. 4/4 rebase: translate a die(preserve-merges) messagePhilip Oakley via GitGitGadget, Jun 4, 2022

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.