diff --git a/envsetup b/envsetup
index c37eedb..6a66295 100755
--- a/envsetup
+++ b/envsetup
@@ -13,6 +13,8 @@ ln -s ${BIN_DIR}/.hh_favorites ~/.hh_favorites
 cp ${BIN_DIR}/.bash_host ~
 
 # Set up git
+## Adopt the 'new' merging behaviour
+git config --global push.default simple
 ## Set the username & email address
 git config --global user.name "Starbeamrainbowlabs"
 git config --global user.email "sbrl@starbeamrainbowlabs.com"