vcs_update: use `git rebase` instead of `git merge`

Signed-off-by: Alejandro Mery <amery@geeks.cl>
10 years ago · 7744ff21e3
1 changed files with 1 additions and 1 deletions
--- a/files/bin/vcs_update
+++ b/files/bin/vcs_update
@ -29,7 +29,7 @@ update_git() {
 	remote=`git config "branch.${branch}.remote"`
 	merge=`git config "branch.${branch}.merge"`
 	git merge -q --stat --ff "$remote/${merge##refs/heads/}"
 	git rebase -q "$remote/${merge##refs/heads/}"
 	if $staged; then
 		git stash pop -q
 		git status -s