jjkiers/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Artem Sapegin 2013-03-01 16:06:29 +04:00
parent d9451fcb0e
commit b4767bf280
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/bash_git.bash
View File

@ -45,7 +45,7 @@ function git-upstream() {
local branch=${1-master} local branch=${1-master}
git fetch upstream git fetch upstream
git checkout $branch git checkout $branch
git merge upstream/$branch git rebase upstream/$branch
} }
# Add all staged files to previous commit # Add all staged files to previous commit