diff --git a/.gitconfig b/.gitconfig index 9de956d..0435f08 100644 --- a/.gitconfig +++ b/.gitconfig @@ -10,3 +10,5 @@ helper = cache --timeout=3600 [color] ui = auto +[pull] + ff = only