[pull]
	rebase = false
[advice]
	addIgnoredFile = false