Cheatsheet¶

Quick reference for daily workflow.

Clone (SSH)¶

git clone git@github.com:org/repo.git
cd repo

git checkout main
git pull --rebase
git checkout -b feature/nameOfFeature/nameOfIssue

git status

git add <file>
git add .

git commit -m "Add CAN timeout validation"

git pull --rebase origin main

git push -u origin feature/nameOfFeature/nameOfIssue

git commit --amend

git rebase -i HEAD~n

After rebase:

git push --force-with-lease

(Only allowed on own branch and after approval if required.)

git revert <commit-hash>

# edit file
git add <file>
git rebase --continue

Abort:

git rebase --abort

Local:

git branch -d feature/nameOfFeature/nameOfIssue

Remote:

git push origin --delete feature/nameOfFeature/nameOfIssue

git log --oneline --graph --decorate

git remote -v

Before opening PR: