diff --git a/roles/home-cli/files/gitconfig b/roles/home-cli/files/gitconfig index 1ac0682..517be95 100644 --- a/roles/home-cli/files/gitconfig +++ b/roles/home-cli/files/gitconfig @@ -1,7 +1,7 @@ [core] autocrlf = input [pull] - rebase = true + ff = only [push] default = simple [color]