diff --git a/bash/aliases b/bash/aliases
index fe118da..7abbb58 100644
--- a/bash/aliases
+++ b/bash/aliases
@@ -16,7 +16,7 @@ alias gco='git checkout'
 alias gdiff='git diff'
 alias gfetch='git fetch -ap'
 alias gmerge='git merge --ff-only'
-alias gpull='git pull --ff-only'
+alias gpull='git pull --rebase'
 alias gpush='git push'
 alias gpush!='git push -u origin `git rev-parse --abbrev-ref HEAD`'
 alias master!='git checkout master'