Git notes

git checkout -b feature/my-new-feature
(use hotfix for salt)

git commit -a -m "updated widget as per JIRA-12345"



If we need to merge last 3 commits

git rebase -i HEAD~3

(squash later commits to newer ones. Fixup also works, and dumps the commit messages)

If I get it wrong, it dumps me back to branchlessness, so I need to git checkout the branch againgit

git push --force