[push] default = simple [core] excludesfile = ~/.dotfiles/git/gitignore [color] ui = true [credential] helper = store [pull] ; If we pull we only want to fast forward, if that is not possible we should not allow pull to work ; Instead use fetch and then either rebase or merge ff = only ; rebase = false [diff] tool = nvimdiff [init] defaultBranch = master