Commit c247c6fc authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Add some git-pull settings to .gitconfig 

(And did a little reformatting of the file)
parent 4ec8985f

.gitconfig

+10 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
	email = dom@kodo.org.uk

	name = Dom Sekotill



[merge]

	conflictstyle = diff3

	defaultToUpStream = yes



[alias]

	graph = log --graph --decorate --color

	fast-forward = merge --ff-only
@@ -19,7 +15,17 @@ 


[color]

	ui = true



[rerere]

	enabled = 1



[push]

	default = simple



[pull]

	ff = only

	rebase = preserve



[merge]

	conflictstyle = diff3

	defaultToUpStream = yes