Some smart gitconfig settings : remember recorded hunks, use mnemonic prefixes in diffs, automatically track, show a stat at the end of a merge. And witch to arne@arnebrasseur.net as canonical email address
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitconfig
I never liked tabs anyway