git branch --list | grep -v '^*' | while read b; do git checkout $b; git merge --ff-only upstream/$b; done