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

Re: [feature wishlist] add commit subcommand to git add -i

From
Conrad Irwin <conrad.irwin@gmail.com>
Date
Aug 14, 2011, 08:48 UTC
Message-ID
<CAOTq_pvMv6JN_jpQvDsmQTwmMgQK9JzuwXr+VF1T6X4=qf3GsQ@mail.gmail.com>
In-Reply-To
<CAJfuBxwW8Dyp8FTS13uPOBKZGL9JOEqaSOhGN+zBJ_8BHpJE3g@mail.gmail.com>
On Sun, Aug 14, 2011 at 1:38 AM, Jim Cromie <jim.cromie@gmail.com> wrote:
Show 8 quoted lines
> going further, if git rebase -i  had ability to  "back" a fixup patch
> back to where it should have been, and adjust the intervening patches
> where conflict would normally happen, that would be awesome.
> Simplistically, this would just shift the patch 1 step back iteratively,
> until it wouldnt apply properly, and then --abort, stopping at the last
> clean rebase.
>
> apologies if this is too hair-brained, or already done.

It sounds like you're looking for several git commit (-p|--interactive) --fixup <commit>, followed by a git rebase -i --autosquash. It's not quite as automatic as you describe, but I think that automating it would be pretty hard to do correctly.

Conrad
Previous: Jim CromieNext: Jim Cromie
Message 2 of 6 in “[feature wishlist] add commit subcommand to git add -i”
  1. Jim CromieAug 14, 2011
  2. Conrad IrwinAug 14, 2011
  3. Jim CromieAug 15, 2011
  4. Ramkumar RamachandraAug 14, 2011
  5. Jim CromieAug 15, 2011
  6. Thomas RastAug 15, 2011

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.