wow - two git related posts today ;-)
I recently found a very nice page with helpful git settings. They are written by Mislav Marohnic. On the first page he is discussing Git merge vs. rebase:
The second one is offering some nice tips when using git:
So it should be a good thing to add some aliases to your ~/.gitconfig. Let’s say you wanna set the shortcut ‘pu’ for pull but with an extra option to always use rebase when pulling:
This helps you to avoid flooding your history with unnecessary merge commits.
Here some helpful shortcuts taken from my ~/.gitconfig:
I found an entry on stackoverflow giving some insight on how to use aliases: http://stackoverflow.com/questions/2553786/how-do-i-alias-commands-in-git