"patch mode" - Patch mode allows you to stage parts of a changed file, instead of the entire file. This allows you to make concise, well-crafted commits that make for an easier to read history.

[–] pomodoro_longbreak@sh.itjust.works 0 points 10 months ago (1 children)

Highly recommend throwing --patch on any git commands you're used to using. You will have the prettiest, most atomic fkn commit, I'm serious people will love you for it.

I mean many people won't care, but the quality folk will notice and approve.

[–] Johanno@feddit.de 0 points 10 months ago (1 children)

We make a singular commit per feature.

[–] pomodoro_longbreak@sh.itjust.works 0 points 10 months ago (1 children)

Trunk based, eh? Yeah, we do that on a couple teams where I'm at, too. I like the philosophy, but force pushing the same commit over and over as you're incorporating review feedback is antisocial, especially when you've got devs trying to test your changes out on their machines.

[–] Omgpwnies@lemmy.world 0 points 10 months ago (1 children)

eh, just squash and merge. Feature branch can be messy as long as main is clean

[–] Johanno@feddit.de 0 points 10 months ago

Yep. You have to make sure your feature branch works.