On 26/05/2022 10:54, Ævar Arnfjörð Bjarmason wrote: > On Thu, May 26 2022, Philip Oakley via GitGitGadget wrote: > >> 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. Thanks, I am a bit busy with family issues, so I'd rather use as-is, unless other feel that the tweaks will be worth it. I'm effectively off-line for the next 5-6 days anyway. -- Philip
