diff --git a/scripts/git-config.sh b/scripts/git-config.sh
index e191d52..7d8e0f0 100755
--- a/scripts/git-config.sh
+++ b/scripts/git-config.sh
@@ -109,6 +109,7 @@ function unset_colors() {
 git_set core.editor vim
 git_set submodule.recurse true
 git_set push.autoSetupRemote true
+git_set pull.ff only
 
 git_alias st status
 
@@ -123,6 +124,7 @@ git_alias copy 'branch --copy'
 git_alias co checkout
 git_alias cob "checkout -b"
 git_alias sw switch
+git_alias swm "switch master"
 git_alias mr $'!sh -c \'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2\' -'
 git_alias pr $'!sh -c \'git fetch $1 pull/$2/head:pr-$1-$2 && git checkout pr-$1-$2\' -'