[user]
	name = Alex Scerba
	email = alex@scerba.org
	signingkey = alex@scerba.org
#[commit]
#	gpgsign = true
#[tag]
#	gpgSign = true
[color]
	ui = true
[init]
	defaultBranch = master
[core]
	hooksPath = ~/.config/git/hooks
[alias]
	l = log --all --oneline --graph --decorate
[pull]
#	rebase = true
[merge]
	conflictstyle = zdiff3
	ff = only
[diff]
	algorithm = histogram