Git Pull With Automatic Rebase [stevenharman.net]