Rebase an existing fork on upstream master and create a new feature branch

git-foo-rebase-upstream-master.md

Rebase an existing fork on upstream master

git clone https://github.com/ryan-beisner/charm-helpers charm-helpers-rb
cd charm-helpers-rb/
git remote add upstream https://github.com/juju/charm-helpers
git fetch upstream
git checkout master
git rebase upstream/master
git log
git push

Make a new branch

git checkout -b fix-ks-wait-test
git push --set-upstream origin fix-ks-wait-test
# (make some changes)
git add .
git commit -m 'Foo'
git push