diff --git a/git/.gitconfig b/git/.gitconfig
index a85bdc5..3221e92 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -13,10 +13,13 @@
 	last = cat-file commit HEAD
 [branch]
   autoSetupRebase = always
+[checkout]
+  defaultRemote = origin
 [merge]
   ff = only
 [push]
   autoSetupRemote = true
+  default = upstream
 [rerere]
 	enabled = true
 [remote]