diff --git a/git/.config/git/config b/git/.config/git/config index 34e6ba9..8700d38 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -36,7 +36,8 @@ prune = true [pull] - ff = only + # ff = only + rebase = true [push] default = current