Damus
clacke: exhausted pixie dream boy πŸ‡ΈπŸ‡ͺπŸ‡­πŸ‡°πŸ’™πŸ’› profile picture
clacke: exhausted pixie dream boy πŸ‡ΈπŸ‡ͺπŸ‡­πŸ‡°πŸ’™πŸ’›
@clacke: exhausted pixie dream boy πŸ‡ΈπŸ‡ͺπŸ‡­πŸ‡°πŸ’™πŸ’›
I sometimes realize, in the middle of a git rebase, that something is annoying and I want to fix it.

What I would usually do is make a commit then and there, let the rebase continue, and then later I'll have to remember that I want to do another rebase to move that commit to the proper place in the commit tree.

But what if your ongoing git rebase is something big, like run a check on each commit and push them as they're verified? I don't want that fix on my PR, and I don't want to skip the rest of the side-effects in this rebase and then start over.
2
clacke: exhausted pixie dream boy πŸ‡ΈπŸ‡ͺπŸ‡­πŸ‡°πŸ’™πŸ’› · 1w
Now what I did was make the fix, run `git rebase --edit-todo`, add a `pick djejfj4746` (the commit sha) to the end of the rebase, then run `git reset --hard HEAD^` to pretend like nothing happened, and `git rebase --continue`. Don't remember things when the tool can remember it for you. #git #GitR...
Alex Schroeder · 1w
nostr:nprofile1qy2hwumn8ghj7un9d3shjtnyd968gmewwp6kyqpqnjzrf5yyyfwent50am07cl0anquqrtcce9qsvqv7lc7kvuu3h77qntdv6u I had just that situation recently and – I made a note in a paper notebook.