Git: merge -> rebase in git-upstream alias.

2013-03-01 16:06:29 +04:00
parent d9451fcb0e
commit b4767bf280
1 changed files with 1 additions and 1 deletions
--- 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