Keeping git coloring when piping

git log    

produces colored output, but when using pipe it loses color information

git log | head

but this can be fixed with

git log --color=always | head 

Special thanks to Dude :D

Git global excluding files

To exclude all unwanted files(.rakeTasks, .tool-version etc.) you can create a global config for git. git config --global core.excludesfile ~/.gitignore_global and in this file:

.rakeTasks
.tool-versions

Have you Cmd-C'd your overcommit and lost your changes?

During overcommit running I have interrupted the process and received following message

Interrupt signal received. Stopping hooks...

⚠  Hook run interrupted by user

then

Unable to restore working tree after pre-commit hooks run:
STDOUT:
STDERR:unable to refresh index

To my horror, all my changes were lost! Fortunately, those were kept in stash, so simple git stash pop helped :) More info here

Remove sensitive data from git repository.

When you forgot to use secrets from the very beginning - and some secrets landed in your repository eg. login/password/secret_key you can remove them in a simple way using filter-branch for example to remove password you need to use:

git filter-branch --tree-filter "find . -type f -exec sed -i -e 's/password/**REMOVED**/g' {} \;"

It will replace password with **REMOVED** in the whole repo and commits.

Rebase pull having uncommitted changes

Do you want to pull with --rebase option, but you have some uncommitted changes? Do you need to git stash and git stash pop every time? Suffer no more with auto stash!

git pull --rebase --autostash origin $(git_current_branch)

or

git config --global rebase.autoStash true
# and then
git pull --rebase

Note: this works only in git 2.6 or newer.