Git is by far the most popular software version control system today, and every software developer surely knows the basics of how to make a git commit. Given the popularity, it is surprising how many people don’t actually know the advanced commands. Mastering them might help you unlock a new level of productivity. Let’s dive in!

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'
  • @fidodoEnglish
    1•10 months ago

    If you’re doing more complex stuff all the time then yes that’s an indication of a problem, but despite your best efforts, complex situations or screw ups do happen and it’s good to know how to fix them, especially if you’re a senior dev that needs to help the rest of the team and resolve conflicts between feature branches. The whole team can’t be perfect all the time.

    Also most of the tips in the article aren’t even about branch management and more about optimizations for huge projects or introspection into the history of large projects.