aboutsummaryrefslogblamecommitdiffstats
path: root/git/config
blob: 28ab974c58f47386fb647a2c45b74b59120bdead (plain) (tree)
1
2
3
4
5
6
7
8
9
10
11
12











                              
[color]
	diff = auto
	status = auto
	branch = auto
[push]
	default = matching
[init]
	defaultBranch = master
[pull]
	rebase = false
[merge]
	conflictStyle = diff3