Git Cheat Sheet

git checkout -b feature/my-new-branch
# add/edit files
git add .
git commit -m "Meaningful message"
git push --set-upstream origin feature/my-new-feature
# do a pull request using the Azure DevOps

git checkout master # there should not be any other branches you care about at this stage
git pull
git checkout -b ... # continue as above

I made changes to the master branch which should be in a feature branch

git stash   # save local changes to the stash
git checkout -b feature/my-new-feature
git stash pop # put back local changes on the new branch

I made changes that I don't want

git reset HEAD --hard # Danger!

I want to delete my latest (local) commit but keep my files

git reset HEAD^1

I want to add changes to the latest (local not-synced) commit

git commit -m "Updated message" --amend # or
git commit --amend

Someone made changes to the master branch while I was working on my own feature branch

git commit ... # commit your changes
git rebase origin/master