diff --git a/src/.gitconfig b/src/.gitconfig index 480165f..201b3b6 100644 --- a/src/.gitconfig +++ b/src/.gitconfig @@ -27,9 +27,6 @@ sur = submodule update --recursive [apply] whitespace = fix -[branch] - autosetupmerge = always - autosetuprebase = always [color] branch = auto diff = auto