Always convert line endings
Make git ff do fast forward only