From 7744ff21e3faf4a1a3c6ff5df1331fb2ed3380d0 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Thu, 17 Jul 2014 11:50:58 +0200 Subject: [PATCH] vcs_update: use `git rebase` instead of `git merge` Signed-off-by: Alejandro Mery --- files/bin/vcs_update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/bin/vcs_update b/files/bin/vcs_update index 97bcf7a..dd929d7 100755 --- 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