Minor changes to the git cheatsheet.

This commit is contained in:
Chris Lane 2013-08-27 19:43:24 -04:00
parent 9e8294b566
commit c7c63b42cd

View file

@ -18,10 +18,10 @@ git push origin master
git push git@github.com:username/project.git git push git@github.com:username/project.git
# To sync a fork with the master repo: # To sync a fork with the master repo:
git remote add upstream git@github.com:name/repo.git (Set a new repo) git remote add upstream git@github.com:name/repo.git # Set a new repo
git remote -v (Confirm new remote repo) git remote -v # Confirm new remote repo
git fetch upstream (Get branches) git fetch upstream # Get branches
git branch -va (List local - remote branches) git branch -va # List local - remote branches
git checkout master (Checpkout local master branch) git checkout master # Checpkout local master branch
git merge upstream/master (Merge remote into local repo) git merge upstream/master # Merge remote into local repo