Recently git cherry-pick saved my ass from a stupid revert. That's when I learned that it's ok to do multiple commits before pushing your code.

A brief tutorial about git cherry-pick on ->


@thumb I adamantly think that you should do many multiple small commits! Each should encompass a "change" and it's up to you on how big changes are but I think they should be smaller than a whole feature.

Slightly contradictory I think each change should be buildable but not as invested in that provided your final pushed commit is.

@lyndon Yeah, I arrived at the same conclusion. commit & push immediately to 'save' my changes stems from the way I learned git initially. Multiple small commits make it so much easier to manage my piece of work logically.

@thumb @lyndon While a lot of small commits are great for development and I encourage using them, I also recommend to do a proper rebasing of changes and write up the story behind the change in a large, atomic commit.

I called this "self-sufficent commits" and wrote a bit about it here:

The reason behind this is, that while small commits are good for development, future you, will thank yourself to know why you built things as you did.

Sign in to participate in the conversation

Fosstodon is an English speaking Mastodon instance that is open to anyone who is interested in technology; particularly free & open source software.