llkats

git flow feature start <branchname>
starts a new branch

git commit -am "commit message"
make commits as usual

git pull
from master branch, pull in latest changes from the repo (repeat often)

git pull origin <branchname>

benzittlau

 git ls-files | grep '\.swp$' | xargs git rm