[user] name = Julien Valroff email = julien@kirya.net [url "git+ssh://git.kirya.net/git/"] insteadOf = kirya: [url "git+ssh://git.debian.org/git/"] insteadOf = debian: [merge "dpkg-mergechangelogs"] name = debian/changelog merge driver driver = dpkg-mergechangelogs -m %O %A %B %A [diff] color = "auto" [core] excludesfile = "~/.gitignore" [color] ui = true [push] default = matching [pull] rebase = true