diff --git a/gitconfig b/gitconfig
index 4bdeb2c..dec6db7 100644
--- a/gitconfig
+++ b/gitconfig
@@ -13,6 +13,14 @@
   fscache = true
 [push]
   default = upstream
+[pull]
+  # Use new merge-ort strategy.
+  twohead = ort
+  # rebase when pulling instead of doing a default merge.
+  rebase = true
+[fetch]
+  # Run 'git remote prune' after fetching.
+  prune = true
 [diff]
   algorithm = patience
 [color]