do an explicit checkout and create branch temp then rebase instead of rebase and create branch

master
melvinzhang 2014-10-29 09:47:16 +08:00
parent b1c3a84b4f
commit 2361d6f4fc
1 changed files with 2 additions and 2 deletions

View File

@ -694,8 +694,8 @@ fetch:
git fetch -v firemind master
rebase-firemind:
git rebase base firemind/master --onto master
git branch temp
git checkout -b temp firemind/master
git rebase base --onto master
git checkout master
git merge --ff-only temp
git branch -d temp