My git cheatsheet

Merge branch without commit:

git merge branch-to-merge-with --no-commit --no-ff