From c7c63b42cd22a01ef5f06f7f87e80482cbc17ff3 Mon Sep 17 00:00:00 2001 From: Chris Lane Date: Tue, 27 Aug 2013 19:43:24 -0400 Subject: [PATCH] Minor changes to the git cheatsheet. --- cheatsheets/git | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cheatsheets/git b/cheatsheets/git index 0923d7d..545dfbe 100644 --- a/cheatsheets/git +++ b/cheatsheets/git @@ -18,10 +18,10 @@ git push origin master git push git@github.com:username/project.git # 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 checkout master (Checpkout local master branch) -git merge upstream/master (Merge remote into local 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 checkout master # Checpkout local master branch +git merge upstream/master # Merge remote into local repo