Git Cheat Sheet

Update your fork from upstream

This is how to keep your personal fork up-to-date with changes from main repository.

$ git remote add upstream https://github.com/AndlyticsProject/andlytics.git

$ git fetch upstream

$ git merge upstream/master

$ git push

I've set up this cronjob on my router, so i dont have to care about merging:

git pull

git fetch upstream

git merge upstream/master -m "merge"

git push origin master

Don't forget to set ~/.ssh/id_rsa properly