Git Cheat Sheet

Merge a feature branch into master in one big commit

git checkout master
git merge --squash feature/xxx

Merge a feature branch into master wihtout commit

git merge feature/xxx --no-commit --no-ff

Nice Commands during Release