Ignore generated files
Use rebase by default when pulling