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