diff = always
[user]
name = Maximilian Friedersdorff
- email = maxf130@gmail.com
+ email = max@friedersdorff.com
[core]
- editor = vim
+ editor = emc
excludesfile = /home/max/.gitignore
[merge]
tool = diffuse
+ ff = false
[push]
default = simple
[alias]