From a20ae18cc9123164f2fc15e853043a16af4f8440 Mon Sep 17 00:00:00 2001 From: Johan Brook Date: Fri, 11 Oct 2024 09:00:00 +0200 Subject: [PATCH] Note edit --- src/notes/2024-10-10-13-05-32.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/notes/2024-10-10-13-05-32.md b/src/notes/2024-10-10-13-05-32.md index 219d000eb..cb3fc6835 100644 --- a/src/notes/2024-10-10-13-05-32.md +++ b/src/notes/2024-10-10-13-05-32.md @@ -62,6 +62,14 @@ For the `rba` alias, I use the "autosquash" feature like this: No tedious manual steps with finding commit hashes and so on. The `--autosquash` option in the rebase works automatically with `git commit --fixup` (there are other options as well, such as `--squash`). +### Update, October 11th 2024: `git-absorb` + +I saw on Mastodon that this tool exists: [`git-absorb`](https://github.com/tummychow/git-absorb). + +It basically automates step 2 above. I simplified this a bit in my example: in reality, you might do _N_ number of fixup commits there. `git-absorb` divides the staged content in hunks and intelligently finds the first ancestor commit which touches on the same code, and creates these fixup commits for you. + +I will give it a try! + ## Scenario: when you just want to start over ```gitconfig