Also see an old article of mine titled "Working with git? These aliases will save you hours!":

http://www.catonmat.net/blog/git-aliases/