Merge branch 'master' of https://github.com/Ashernor/cheat into Ashernor-master

* 'master' of https://github.com/Ashernor/cheat:
  Adding wget and curl cheats and updating git cheat

Conflicts:
	cheatsheets/curl
This commit is contained in:
Chris Lane
2013-10-23 22:04:31 -04:00
3 changed files with 38 additions and 9 deletions

View File

@ -25,6 +25,7 @@ git remote add upstream git@github.com:name/repo.git # Set a new repo
git remote -v # Confirm new remote repo
git fetch upstream # Get branches
git branch -va # List local - remote branches
git branch -D branch_name # Delete the branch branch_name
git checkout master # Checkout local master branch
git checkout -b branch # Create and checkout a new branch
git merge upstream/master # Merge remote into local repo