Use much simpler pull.rebase configuration

It has been resent since Git v1.7.6.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Merge pull request #123 from felipec/fc/pull-rebase

Use much simpler pull.rebase configuration