> If you use something frequently you should know it in-depth.

I prefer to remain oblivious to many things. Two views of the Mississippi and all that.

Git works reliably and achieves my humble expectations. Thanks git.

But in reality I use about the same set of commands. The exception being ‘cherry-pick’ which I avoid solely on disliking the name.

what would you call it instead? or does the word cherry have some weird association in your mind?

No, it’s just weird and out of context. Just plain “pick” maybe.

maybe

    git alias --global pick cherry-pick

cherry picking has a negative connotation in its most common usage.

sure but is it enough to avoid using it though? I don't like to get screwed in business, but I don't avoid the screwdriver in my toolbox when I need one.

Hard agree. I love this mindset! If you put a tool in your toolbag you should know how to use it.

Git is definitely abstract and hard to get the hang of but totally worth it - pays dividends in terms of the options it puts at your disposal. And the stimulating nature of learning how it works so that you can think for yourself to figure out a solution, instead of just memorizing 3 commands and running to AI for help when you get a little stuck.

Version control is one of our main tools for interacting with other developers. Having a rich understanding of your version control software often helps to find solutions and workarounds for problems which would otherwise result in needless conflict.

Core:

- pull

- push

- commit/checkout

- merge

Quality of life:

- stash

- diff

Asking for trouble:

- revert

- cherry-pick

Your definition matches my mine of a tight subset of git.

lol not sure why this got downvoted unless it's because ~1 is redundant and you can either do HEAD^ or HEAD~ and save one keystroke

I would just add `git rebase -i` to the mix. Very useful to clean up a work branch before submitting it for others. Sometimes you just need a bunch of "wip" commits, e.g. testing CI scripts, deploying a optimization on the side for further testing, etc. and rebase is a must if you care about the commit log.

You forgot to include an explanation of what rebase does, which is important for knowing when to actually use it, instead of just specific goals you might have.