git workflow

cm0002@lemmy.world · 4 days ago

Limonene@lemmy.world · 4 days ago

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

Dave@lemmy.world · 4 days ago

Yes yes, combined with git add -P makes small, meaningful commits so much easier.

fossphi@lemm.ee · 4 days ago

Check out magit!

Dave@lemmy.world · 4 days ago

Alas I sold my soul to VSCode a long time ago.

Also, ew, emacs 😝

fossphi@lemm.ee · 3 days ago

Oh come on, try it out! I know some people who use emacs only for magit. It really is that good.

A few of them slowly became full on emacs users…

callmepk@lemmy.world · 3 days ago

thirteene@lemmy.world · 3 days ago

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

zero_spelled_with_an_ecks@programming.dev · 4 days ago

… What’s git merge look like?

Comtief@lemm.ee · 4 days ago

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.

tatterdemalion@programming.dev · 4 days ago

Use Jujutsu jj and you won’t have this problem