script to rebase master branch on trunk, bashrc aliases