git.md

Useful git commands

A nice introduction to git

https://missing.csail.mit.edu/2020/version-control/

Add an existing codebase to a new repository

git init
git add *.py
git commit
git remote add origin <repourl here>
git push -u -f origin main

To allow mergin of unrelated histories

git pull origin main --allow-unrelated-histories

Create a new branch in a repository

git checkout -b branchname

Delete a local branch

git branch --delete <branchname>

Set repo to a previous commit without changing head

git revert --no-commit <commitid>

Update a forked repo with changes upstream

Note: On github, there is also a button which simply does that, completely without shell commands

git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git
git fetch upstream

# then: (like "git pull" which is fetch + merge)
git merge upstream/master master

# or, replay your local work on top of the fetched branch
# like a "git pull --rebase"
git rebase upstream/master

Best practices on when to use merge and when rebase