[user] name = Peter Palfrader email = peter@palfrader.org signingkey = E3ED482E44A53F5BBE585032D50F9EBC09E69937 #signingkey = 25FC1614B8F87B52FF2F99B962AF4031C82E0039 [alias] st = status ci = commit co = checkout wdiff = diff --color-words wshow = show --color-words wlog = log -p --word-diff [color] diff = auto status = auto branch = auto [http] sslCAPath = /etc/ssl/certs [pull] mergeoptions = --ff-only ff = only [merge] ff = false summary = true log = 5000 [branch "debian-merge"] mergeoptions = --no-ff --no-commit --log=5000 [branch "debian"] mergeoptions = --no-ff --no-commit --log=5000 [core] excludesfile = ~/.gitignore [push] default = simple [transfer] fsckobjects = true [fetch] fsckobjects = true [receive] fsckobjects = true #[rerere] # enabled = true # autoupdate = true