Git cheatsheet

Syncing a fork with updates from original

git fetch upstream
git checkout master
git merge upstream/master

To do a hard reset (deleting all your local changes):

git reset --hard upstream/master
git push origin master --force

Assume unchanged

To avoid git tracking your local changes, you could just tell git to assume the file is unchanged. Useful if you need to set secrets in files.

• git update-index --assume-unchanged filename stops tracking changes
• git update-index --no-assume-unchanged filename starts tracking changes again.