A place for developers to talk about building on Farcaster.

/dev

thomas

PhD in aviation ∩ climate science | Aviator, diver, Etherean, nexialist | Host of /diving /ethfinance /eth-staker /geopolitics /science /singapore /thomas

Lots of benefits to committing atomically and as often as possible – easier to migrate features to other branches by cherry-picking or rebasing, easier to rollback or revert specific features out of order, easier to track down where a bug might have been introduced. More work upfront but well worth it in my opinion.

Why Git is better when you make many small, independent, thoughtfully-messaged commits:

Why Git is better when you make many small, independent, thoughtfully-messaged commits:

https://www.aleksandrhovhannisyan.com/blog/atomic-git-commits/

/frontend dev・founder/decentralized data wrangler /blockhead・UI/UX abstractionist・DeFi/web3 builder・dropout・24・prev /dydx, ritual.net・x.com/darryl__yeo

Tip for sifting through changes to stage: use GitHub Desktop, or Cmd+Shift+P “Git: Stage Selected Ranges” in VSCode/Cursor.

Also, don’t let this upfront work stop you from simply committing! Commit something directionally correct first, then get used to rewriting history and performing “time heists” on your past self👇

Apply staged changes to most recent commit:

    git commit --amend

Or, make a new commit that is marked as “fixing up” a past commit:

    git commit --fixup <commit hash here>

(Or install `git absorb` to automatically find the relevant commit to fix up for you!)

    git absorb --base HEAD~20

Then finally, rearrange and squash the relevant commits together:

    git rebase -i --autosquash HEAD~20
    git push -f

(Replace `HEAD~20` with an upstream branch name or your own estimate of how many commits ago you need to time-travel back to!)

DX Engineer | Head of Developer Relations at /pinata | Building orbiter.host | stevedylan.dev/links

Ooh, cool TUI! I usually Cmd+Shift+P “Git: Stage Selected Ranges” in Cursor for this.

This is one reason I love using LazyGit. Makes it super easy to only commit particular diffs inside a file vs the whole thing; pick and choose the changes that make a unit.