Public
- Public
- Network
- Groups
- Featured
- Popular
- People

Conversation

Notices

Embed this notice
Chris Siebenmann (cks@mastodon.social)'s status on Monday, 03-Mar-2025 13:26:23 JST Chris Siebenmann

@drscriptt I want my uncommitted change to be added to an existing local commit (which in git rebase terms is a fixup of a prior commit). In theory git-absorb is good for this, in practice it didn't go.

In conversation about a year ago from mastodon.social permalink
- Embed this notice
  Chris Siebenmann (cks@mastodon.social)'s status on Monday, 03-Mar-2025 13:26:22 JST Chris Siebenmann
  in reply to
  - Joshua M. Clulow
  @jmc Yeah, that's the harder manual magic to do everything. git-absorb (in theory) automates basically the 'git commit --fixup=<find the right commit>' bit and will run the git rebase for you.
  
  In conversation about a year ago permalink
  
  Haelwenn /элвэн/ :triskell: likes this.
- Embed this notice
  Joshua M. Clulow (jmc@m.unix.house)'s status on Monday, 03-Mar-2025 13:26:23 JST Joshua M. Clulow
  in reply to
  
  @cks I think this is sort of what...
  git commit --fixup PREVIOUS_COMMIT
  ... is for, when then combined with a "rebase --autosquash"?
  
  In conversation about a year ago permalink

Feeds