Welcome to my technology learning website. The goal of this site is to learn and retain as much information as possible. I consider this blog my knowledge base and hope that you both find and share knowledge here as well. Also for those wondering, Rhyous is pronounced ‘rī-əs. As in the words ‘Rye‘ and ‘us‘ compounded into a two syllable word.
Please take a moment to subscribe, or setup an RSS feed so you never miss a post.
Git Cheatsheet
Clone
git clone <path or url to repo>
Create an empty repo
git init
Check if upstream has updates
git fetch
Switch to another branch
git checkout mybranch
Pull upstream updates
git pull
Add a file
git add filename
Move a file
git mv sourcefile destinationfile
Note: You can move a directory or source file or destination file can include directories.
Delete a local branch
git branch -d mybranch
Status
git status
git merge
git merge myBranch
Take all upstream source files
git checkout --ours . git add .
Keep all local files
git checkout --theirs . git add .
Abort the merge
git merge --abort
