summaryrefslogtreecommitdiff
path: root/common/.gitconfig
blob: 2bb8fe5b402ad306cc4a1174492d2c1a0be9f740 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
[user]
	name = Kjetil Orbekk
	email = kj@orbekk.com
[color]
        diff = auto
        status = auto
        branch = auto
        ui = true
[push]
	default = simple
[sendemail]
	smtpencryption = tls
	smtpserver = mail.messagingengine.com
	smtpuser = kj@orbekk.com
	smtpserverport = 587
[pull]
	rebase = true
[merge]
	conflictStyle = diff3