Programming

17443 readers

137 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Follow the programming.dev instance rules
Keep content related to programming in some way
If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev

founded 1 year ago

MODERATORS

snowe@programming.dev

Ategon@programming.dev

MaungaHikoi@lemmy.nz

Advanced git commands every senior software developer needs to know (optimizedbyotto.com)

submitted 8 months ago by otto@programming.dev to c/programming@programming.dev

42 comments fedilink hide all child comments

As aliases

alias g-log="git log --graph --format='format:%C(yellow)%h%C(reset) %s %C(magenta)%cr%C(reset)%C(auto)%d%C(reset)'"
alias g-history='gitk --all &'
alias g-checkout='git checkout $(git branch --sort=-committerdate --no-merged | fzf)'
alias g-commit='git citool &'
alias g-amend='git citool --amend &'
alias g-rebase='git rebase --interactive --autosquash'
alias g-pull='git pull --verbose --rebase'
alias g-pushf='git push --verbose --force-with-lease'
alias g-status='git status --ignored'
alias g-clean='git clean -fdx && git reset --hard && git submodule foreach --recursive git clean -fdx && git submodule foreach --recursive git reset --hard'

you are viewing a single comment's thread
view the rest of the comments

[–] MsPenguinette@lemmy.world 25 points 8 months ago (3 children)

I'm gonna be completely honest. I don't truly get all the inner working of git. I'm a senior DevOps Engineer and been using git for a decade, but is git is simular to sed or awk for me. I know how to do what I want really well but when shit goes wrong, I'm flying by the seat of my pants.

A lot of times, I just know what to do to fix things because it's rote memory with substitutions. But if you needed me to explain upstreams and rebases in actual detail, I'd be in trouble. But it rarely becomes an actual problem to the level where I'll dedicate time to learning all the advanced stuff.

That said, I've learnt that most senior people also just pretend they get it all but instead are just relying on rote memorization and basic concepts. Anyone else here in the same camp of being a fraud with git?

[–] Graphy@lemmy.world 7 points 8 months ago

Anytime I’m about to get fancy with git I have to stop and remember that I’m an idiot and am probably not doing something else right.

[–] GissaMittJobb@lemmy.ml 5 points 8 months ago

The fact that you have to kind of understand how git works under the hood to really unlock its full potential is a definite design flaw of the tool, but given its ubiquitous use in our industry, I encourage you to check out how git works under the hood. Once you learn the underlying concepts, you reach a whole new level of proficiency with git, no longer having to just get by, and instead you get to thrive.

[–] otto@programming.dev 4 points 8 months ago

I had the same feeling until I started using gitk. I always have a gitk window open and press F5 to reload, so it shows me the state of everything after I've run git commands. Now I grasp everything much better.