#gitrebase — Public Fediverse posts

Nice git experience.

With A and B being logical streams of development I made a mess:

main -> A1 -> B1 -> A2 -> B2 -> B3
\-> A3
\-> B4 ... B10

I mixed A, B before noticing the need for 2 branches. I did:

- Switch to A3, rebase interactively to B1'...B3' A1'...A3'
- Switch to B3, rebase interactively and delete all the Ai in front
- Rebase B10 onto B3'.

I de-mixed two streams of development into their respective branches.😀

Watch it happen with gitk --reflog.

#git #GitRebase

🎉 Behold! A thrilling tale of coders quaking in their boots at the mere mention of "git rebase"😱. Fear not, dear reader, because in this extensive guide, we're assured that the very worst outcome is... wait for it... deleting your work! 🤔💥 Because nothing spells confidence like a digital facepalm.
https://www.brethorsting.com/blog/2026/01/git-rebase-for-the-terrified/ #gitrebase #codingadventures #digitalfacepalm #programmerhumor #techguides #HackerNews #ngated

🎉 Behold! A thrilling tale of coders quaking in their boots at the mere mention of "git rebase"😱. Fear not, dear reader, because in this extensive guide, we're assured that the very worst outcome is... wait for it... deleting your work! 🤔💥 Because nothing spells confidence like a digital facepalm.
https://www.brethorsting.com/blog/2026/01/git-rebase-for-the-terrified/ #gitrebase #codingadventures #digitalfacepalm #programmerhumor #techguides #HackerNews #ngated

🎉 Behold! A thrilling tale of coders quaking in their boots at the mere mention of "git rebase"😱. Fear not, dear reader, because in this extensive guide, we're assured that the very worst outcome is... wait for it... deleting your work! 🤔💥 Because nothing spells confidence like a digital facepalm.
https://www.brethorsting.com/blog/2026/01/git-rebase-for-the-terrified/ #gitrebase #codingadventures #digitalfacepalm #programmerhumor #techguides #HackerNews #ngated

🎉 Behold! A thrilling tale of coders quaking in their boots at the mere mention of "git rebase"😱. Fear not, dear reader, because in this extensive guide, we're assured that the very worst outcome is... wait for it... deleting your work! 🤔💥 Because nothing spells confidence like a digital facepalm.
https://www.brethorsting.com/blog/2026/01/git-rebase-for-the-terrified/ #gitrebase #codingadventures #digitalfacepalm #programmerhumor #techguides #HackerNews #ngated

Stacked Diffs with git rebase —onto

https://dineshpandiyan.com/blog/stacked-diffs-with-rebase-onto/

#HackerNews #StackedDiffs #gitRebase #codingTips #versionControl

Starting Monday off with a nasty Git merge conflict and some rebase loop hell. Because why not.

#Git #GitRebase

`git rebase -i --rebase-merges`
allows you to recreate merge commits in the history; absolutely mind blowing

I hope I'll never use it.

#git #GitRebase

@raboof Oh, nice!

> the break command (added in Git 2.20)

Sweet! I've been using the trick originally described, putting a dummy edit after the merge and then resetting back to the merge, for years!

I absolutely love --rebase-merges and use it many times per day to build and keep track of multiple parallel PRs.

#git #GitRebase #GitRebaseInteractive

« The #GitRebase command allows you to adjust the history of your #Git repository. It's a useful feature, but of course, mistakes can be made. Use the #GitReflog command to recover. » by Agil Antony on @osdc
› https://opensource.com/article/23/1/git-reflog

It's still far from finished, but please welcome Bluebird! A Mac app for rewriting git history extremely quickly.

Reorder commits, amend old ones and fixup any two—with just a drag-and-drop or a couple of keystrokes.
Never slow down to save workdir changes—they're preserved automatically—and ⌘Z anything, even conflict resolutions.
It's direct manipulation for git rebase! No special mode needed.

I still have a lot to do, but boyyy is the app starting to feel useful 😊

#macos #gitrebase

> --fixup=reword:<commit> creates an "amend!" commit which replaces the log message of <commit> with its own log message but makes no changes to the content of <commit>.