temp should not track firemind/master

master
melvinzhang 2014-10-29 09:49:42 +08:00
parent 2361d6f4fc
commit f726a94958
1 changed files with 1 additions and 1 deletions

View File

@ -694,7 +694,7 @@ fetch:
git fetch -v firemind master
rebase-firemind:
git checkout -b temp firemind/master
git checkout -b temp --no-track firemind/master
git rebase base --onto master
git checkout master
git merge --ff-only temp