diff --git a/includes/bash_git.bash b/includes/bash_git.bash
index 7c7b3ea..74f7954 100644
--- a/includes/bash_git.bash
+++ b/includes/bash_git.bash
@@ -45,7 +45,7 @@ function git-upstream() {
 	local branch=${1-master}
 	git fetch upstream
 	git checkout $branch
-	git merge upstream/$branch
+	git rebase upstream/$branch
 }
 
 # Add all staged files to previous commit