+
+[http]
+ cookiefile = ~/.gitcookies
+
+[transfer]
+ # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
+ fsckobjects = true
+
+[merge "merge-changelog"]
+ name = GNU-style ChangeLog merge driver
+ driver = /usr/bin/git-merge-changelog %O %A %B
+