git workflow

Be a man.

‘git commit -am “changes”’

I like git add because then you can do git diff --staged

... What's git merge look like?

grow up, use "git add -p" and craft perfect artisanal commits

Real 10x vibe developers use https://jj-vcs.github.io/jj/latest/, no need to add or commit!

i'm sure there are much better tools available, but i'm just used to git gui where rescan, commit and push all are in order.

Every bloody time, though this case the people not on the Ryanair flight may be the lucky ones. If only git was the most unnecessarily arcane thing devs have to/choose to work with.

I specifically have a oh-shit alias for this kind of stuff lol: https://code.wedotstud.io/patrick/dotfiles/src/commit/c2f93629fe27d1747ceb22b4d6442840d109aa99/.gitconfig#L28

Use Jujutsu jj and you won't have this problem

lazygit is pretty cool too.

I set this up for seamless commits:

function gao() {
     git add .
     git commit -a -m "$*"
     git push origin `git rev-parse --abbrev-ref HEAD`
 }

Usage: gao fixing a typo

Jujutsu time 😁