Git Cheat Sheet

Jump to bottom Edit New page

fritogotlayed edited this page Jan 29, 2015 · 3 revisions

Letting my local repository know about DUWS-R

For SSH git remote add upstream [email protected]:DUWS-R-Team/DUWS-R.git
For HTTP git remote add upstream https://github.com/DUWS-R-Team/DUWS-R.git

Creating a new branch

git checkout master - Put me on my master branch
git checkout -b MyNewBranchName - Create a new branch based off my master

Getting a branch to use the latest version of code from DUWS-R

Updating local master
- git fetch upstream - Let my local know about the changes on DUWS-R
- git checkout master - Put me on my master branch
- git rebase upstream\master - Bring my local master up to match the upstream master
Updating another branch (perform the above steps first)
- git checkout MyBranchName - Put me on my branch
- git rebase master - Update me to my master
  - If you have problem here you most likely need to merge or abort
    - You can abort by typing git rebase --abort
    - You can merge by following this guide