troyfolger

Git tips

Squashing commits with no rebase:

git checkout master
# do code stuff, decide to start a branch
git checkout -b newbranch
# do more code stuff
git commit -m "commit one"
git push