loading...

"git nah" and more handy Git aliases

michi profile image Michael Z Updated on ・2 min read

Git (2 Part Series)

1) Undo changes in Git - Cheat sheet for git checkout, stash, reset, clean, revert, rebase -i, amend 2) "git nah" and more handy Git aliases

Originally posted at michaelzanggl.com. Subscribe to my newsletter to never miss out on new content.

A while ago I posted an article on undoing changes in Git, but some of these arguments or flags just don't want to stick in my head or, I use them so often I don't want to write them out every time. Luckily Git provides us with the ability to create our own custom commands.

For example, if you want to just do git c instead of git commit you could register the following alias:

git config --global alias.c "commit"

With that being said, I want to introduce my top three git aliases:

git nah

Did you ever write something out and then felt like "nah...". Now you can put your thoughts into action with this handy alias. Reset any local and staged changes as if nothing happened.

git config --global alias.nah "!git reset --hard && git clean -df"

Notice the exclamation mark. It needs this so we can run custom commands. This allows us to combine two git commands.

git amend

Sometimes you just miss committing something. Adding more changes to the latest commit was never easier. It doesn't even open vim for you to change the commit message, it just appends to the latest commit.

git config --global alias.amend "commit --amend --no-edit"

git update

While working on a feature branch, more than often, by the time you want to merge back into the main branch (develop/master), that main branch already has a few new commits. Keeping your local branch up to date will help avoiding big merge conflicts. I use this one daily.

git config --global alias.update "pull --rebase origin develop"

bonus

Adding "-n" when committing allows you to skip precommit hooks like linting. This is sometimes necessary when working with legacy code. The following alias at least makes you feel bad about it.

git config --global alias.commit-crime "commit -n"

Last but not least here is a handy alias to list all aliases. Let's name it "alias".

git config --global alias.alias "! git config --get-regexp ^alias\. | sed -e s/^alias\.// -e s/\ /\ =\ /"

Git (2 Part Series)

1) Undo changes in Git - Cheat sheet for git checkout, stash, reset, clean, revert, rebase -i, amend 2) "git nah" and more handy Git aliases

Posted on by:

Discussion

markdown guide
 

git rekt

git config --global alias.rekt = "reset --hard"

 

I'm stealing this one for demacia

 
 
 

Nice post!

Some of the examples are broken.
The = is part of the config syntax but must not be present on the command line. For example

git config --global alias.c = "commit"

should be

git config --global alias.c "commit"
 

Thanks for that! I corrected it

 
 

Instead of specifying branch name develop, which might get executed on another branch out of habbit, why not get current branch first? Search for ggpull and use its implementation :)

 

"Pushup" - to push commits from a (new) local branch to its (new) upstream:

git config --global alias.pushup "! git push --set-upstream origin \$(git branch | grep '*' | cut -d ' ' -f2)"

 

It is sometimes recommended to use "pull --rebase=merges" instead of just "pull --rebase".

 
 

This is really good stuff! I would just make sure to not use git nah if I already pushed my code to the upstream.