git for dummys [WIP!] (like me)

Clone the repo with SSH

git clone [e-mail]:Open-Surface-RT/grate-linux.git

Add upstream

git remote add upstream https://github.com/grate-driver/linux.git

update to upstream

git fetch upstream --depth=1

edit local commits

git rebase -i HEAD~n

solve merge conflicts

https://phoenixnap.com/kb/how-to-resolve-merge-conflicts-in-git

log stat

git log --stat