Helpful git aliases and config settings

This creates a bash function g, for git, which defaults to git status when there are no arguments.

function g () {
    if [[ $# == 0 ]]
    then
        git status
    else
        git "$@"
    fi
}

image978×976 40.2 KB

You might like this GitHub - torbiak/git-autofixup: create fixup commits for topic branches · GitHub

I alias it git af.

nit: You don’t need the --force here.

This is a good idea! I feel this should really be the default of git as showing help isn’t that helpful as most people know how to get help (and are probably looking online anyway).

My g is a function that creates a git repo:

g () { mkdir -p "$1" && cd "$1" && git init; }

I otherwise don’t have much to contribute here as I do the vast amount of my gitting in fugitive.vim. I have a couple of pretty uninteresting aliases like gs for git status (which happens also be my vim mapping to open the fugitive status window!) It finally bit me for the first last year when I actually wanted to experiment with ghost script for my job, but then I found out you can bypass aliases by prefixing them with a \ so it worked as a learning moment

Oh! One little trick that it seems a lot of people don’t know (my data is my coworkers) is that instead of HEAD~N, you can just spam ^ which I find easier to type. So HEAD~3 can also be written as HEAD^^^. You can put as many as you want, it’s kinda funny in a way

Also, HEAD doesn’t need to be written in caps anymore. It can also be written as @, though I find that more annoying to type on my keyboard than head.

Yeah, I know, it’s a holdover from a time when you actually needed to have both flags, as --force-with-lease did not imply --force.

Oh interesting, I did not know that!

If you use Oh My Zsh, there’s a gold mine of aliases at your fingertips.

Two personal aliases that I use all the time:
glm - See the commits for the current branch since it branched off from master.

alias glm='git log --oneline master..'

gccp - Copy the current (short) commit hash to the clipboard (pbcopy usually only on OSX, replace with xclip or whatever else you use if needed).

I use this when making changes on a Pull Request. It’s super helpful to respond to a comment and include the commit hash with makes the change being discussed. Github automatically turns this text (if the commit exists on GH) into a link to the commit, making it super easy for followup reviews, etc.

alias gccp="git rev-parse --short HEAD | tr -d '\n' | pbcopy"

Sorry I forgot to respond to this—I was too busy having a mini heart attack over the inline types thread

I’ve never used ommyzsh but I did used to have that mapping! I got rid of it once I realized I wanted to it across other branches as well. I generally don’t have very many aliases at but I do I have gl for git log which is quite long:

alias gl="git log --pretty=format:'%Cred%H%Creset%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"

So now I just do gl main...

Does shell completion work with these functions?

I never even thought to try but yes! Well, autocompletion doesn’t make sense for my g alias as I’m always creating a directory that doesn’t exist, but ya, I just tried gl and ya it all works.