joyceyan

git fetch upstream
git checkout upstream/wboc15
git checkout -b my_feature

git rebase -i HEAD~x

git fetch upstream
git checkout upstream/wboc15

git push origin my_feature