lorinfields
9/18/2018 - 9:41 PM

git

# vim YOU WILL NEED
:q short for quit :q! quit without saving  :wq write and quit 
# check status and log
git status
git log
git diff
# branch info
git branch 
# check which remote repo you are feeding and pulling from
git remote -v
# change the remote repo you are feeding and pulling from
git remote add upstream http://GITHUB/URL.git
# grab everything that is upstream i dont have yet
git fetch upstream

# pull all contents back from master
git pull upstream master
git push upstream master
# bring in the higher level folder to merge
git add --all
git commit -m "comment"
git push origin master
#force pull 
git fetch --all
git reset --hard origin/master
#OR If you are on some other branch:
git reset --hard origin/<branch_name>