From b4767bf280b7168491d3b579390bd9e9bb49b8e8 Mon Sep 17 00:00:00 2001 From: Artem Sapegin Date: Fri, 1 Mar 2013 16:06:29 +0400 Subject: [PATCH] Git: merge -> rebase in git-upstream alias. --- includes/bash_git.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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