From c6441524b08f1d24b48f30a3dbca458767efa1ca Mon Sep 17 00:00:00 2001 From: Chris Lane Date: Wed, 23 Oct 2013 22:06:48 -0400 Subject: [PATCH] Git cheatsheet: trivial changes Slightly reorganized the order in which some of the examples were presented. --- cheatsheets/git | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cheatsheets/git b/cheatsheets/git index cce7c18..45c6057 100644 --- a/cheatsheets/git +++ b/cheatsheets/git @@ -20,14 +20,16 @@ git push origin master # To push to a specified repository: git push git@github.com:username/project.git +# To delete the branch "branch_name" +git branch -D branch_name + # To sync a fork with the master repo: 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 checkout -b new_branch # Create and checkout a new branch git merge upstream/master # Merge remote into local repo git show 83fb499 # Show what a commit did. git log # Show all the commits