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

Re: git-rebase --undo-skip proposal

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 15, 2018, 13:06 UTC
Message-ID
<nycvar.QRO.7.76.6.1802151403360.35@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To
<CA+P7+xpBW7Sq89f5RK6cCcLYGR0Rh0aWdWrhqjerKUi5xUUKtQ@mail.gmail.com>
Hi Jake,
On Wed, 14 Feb 2018, Jacob Keller wrote:
Show 17 quoted lines
> On Wed, Feb 14, 2018 at 5:50 PM, Psidium Guajava <psiidium@gmail.com> wrote:
> > 2018-02-14 22:53 GMT-02:00 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
> >> Now, when is the next possible time you can call `git rebase --undo-skip`?
> >
> > What if the scope were reduced from `--undo-skip` to `--undo-last-skip`?
> > Also, further reduce the scope to only allow `--undo-last-skip` during
> > a ongoing rebase, not caring about a finished one?
> >
> > But, this could be so niche that I have doubts if this would ever be used;
> 
> I think this is too niche to actually be useful in practice,
> especially since figuring out exactly what to replay might be tricky..
> I suppose it could keep track of where in the rebase the last skip was
> used, and then just go back to rebase and stop there again? That
> sounds like just redoing the rebase is easier.. (ie: use the reflog to
> go back to before the rebase started, and then re-run it again and
> don't skip this time).

Yes, and having a record of what commits were skipped would probably be very helpful not only in this instance.

Maybe also a record of what commits caused merge conflicts, which a mapping between original and new commit (which does get a bit tricky with fixup!/squash! commits, though).

Ciao, Dscho

Previous: Jacob KellerNext: Paul Tan
Message 9 of 10 in “git-rebase --undo-skip proposal”
  1. Psidium GuajavaFeb 13, 2018
  2. Stefan BellerFeb 13, 2018
  3. Psidium GuajavaFeb 15, 2018
  4. Johannes SchindelinFeb 15, 2018
  5. Jacob KellerFeb 15, 2018
  6. Johannes SchindelinFeb 15, 2018
  7. Psidium GuajavaFeb 15, 2018
  8. Jacob KellerFeb 15, 2018
  9. Johannes SchindelinFeb 15, 2018
  10. Paul TanFeb 15, 2018

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.