[user] name = Peter Palfrader email = peter@palfrader.org [alias] st = status ci = commit co = checkout [color] diff = auto status = auto branch = auto [http] sslCAPath = /etc/ssl/certs [merge] summary = true [branch "debian-merge"] mergeoptions = --no-ff --no-commit [branch "debian"] mergeoptions = --no-ff --no-commit