diff --git a/bash/aliases b/bash/aliases
index 39a9492..c60923a 100644
--- a/bash/aliases
+++ b/bash/aliases
@@ -11,7 +11,7 @@ alias gaa='git add .'
 alias gco='git checkout'
 alias gc='git commit'
 alias gpush='git push'
-alias gpull='git pull'
+alias gpull='git pull --ff-only'
 alias gfetch='git fetch'
 alias gdiff='git diff'
 alias merged?='git branch --merged'