Improving your git efficiency using git alias
Video: Improving your git efficiency using git alias (14 min)
As I mentioned in the video, I've been loving using git alias lately... and everyone I've shared it with, seems to love the idea of it at least as well.
My current .gitconfig is below, you can find my latest in GitHub in my dotfiles repo https://github.com/GordonBeeming/dotfiles/blob/main/.gitconfig
[user]
name = xxxxxxx
email = xxxxxxx
signkey = xxxxxxxxxxx
[tag]
gpgsign = true
forceSignAnnotated = true
[init]
defaultbranch = main
[commit]
gpgsign = true
[push]
# gpgsign = true # GitHub doesn't support this yet
autoSetupRemote = true
[safe]
directory = /Library/Developer/
[gpg]
program = gpg2
[pull]
rebase = false
[log]
showSignature = true
[alias]
me = !git config --local user.name 'Gordon Beeming' && git config --local user.email 'gpg@gordonbeeming.com' && git config --local gpg.format 'ssh' && git config --local commit.gpgsign 'true' && git config --local user.signingKey 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCsRuWh3kYXQZdqpC6USqMpbAI63lXn85O0jFDcnFdR' && echo 'Switched to "Gordon Beeming [Personal] (SSH)".'
ssw = !git config --local user.name 'Gordon Beeming [SSW • Microsoft MVP]' && git config --local user.email 'gordonbeeming@ssw.com.au' && git config --local gpg.format 'ssh' && git config --local commit.gpgsign 'true' && git config --local user.signingKey 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMCsRuWh3kYXQZdqpC6USqMpbAI63lXn85O0jFDcnFdR' && echo 'Switched to "Gordon Beeming [SSW • Microsoft MVP] (SSH)".'
me2 = !git config --local user.name 'Gordon Beeming' && git config --local user.email 'gpg@gordonbeeming.com' && git config --local commit.gpgsign 'true' && git config --local user.signingKey 'D1C6C5C67ED8589E!' && echo 'Switched to "Gordon Beeming [Personal] (Yubi Key)".'
ssw2 = !git config --local user.name 'Gordon Beeming [SSW • Microsoft MVP]' && git config --local user.email 'gordonbeeming@ssw.com.au' && git config --local commit.gpgsign 'true' && git config --local user.signingKey '0DB5A2459ED2BAAF!' && echo 'Switched to "Gordon Beeming [SSW • Microsoft MVP] (Yubi Key)".'
nb = !git fetch && git checkout origin/main && git pull origin main && git checkout -b
nb2 = !git fetch && git checkout origin/master && git pull origin master && git checkout -b
ca = !git add -A && git commit -m
[gitbutler]
gitbutlerCommitter = 1
signCommits = true
[gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
[core]
autocrlf = inputA command that I didn't talk about in the video, but happens to be the alias I used the most every day is my git nb new-feature.
I'd use this when I've just commited some changes on a branch, maybe those changes have been squashed into the main/master branch and now I'm ready to make more changes. Before my alias, this is what I would normally do
# Switch back to the main branch
git checkout main
# Pull the latest changes from the remote origin
git pull origin main
# Now that I have the latest changes, I can create my new branch for development
git checkout -b new-featureIt's only a couple of lines but when you are doing it a couple of times a day, it gets a little much.
So instead of these couple of lines, I can simple type
# if the default branch is main
git nb new-feature
# if the default branch is master
git nb2 new-featureIf you want to use these aliases yourself, you can grab the config from above and put it in your .gitconfig, or you can run the below 2 commands and add them both to your .gitconfig.
# adds the "new branch" sub command for main
git config --global alias.nb '!git checkout main && git fetch && git pull && git checkout -b'
# adds the "new branch" sub command for master
git config --global alias.nb2 '!git checkout master && git fetch && git pull && git checkout -b'If you found any of this useful, you can join the conversation on the LinkedIn post or YouTube video
LinkedIn: https://www.linkedin.com/feed/update/urn:li:activity:7175983551631286272/