@@ -36,8 +36,6 @@
[merge]
defaultToUpstream = true
-[branch]
- autosetuprebase = remote
[alias]
short = log --graph --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --patience