From 4960f45f6f7686d631e81faa14140f95baa0dddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Pe=C3=B1a?= Date: Wed, 28 Aug 2013 10:30:37 +0300 Subject: [PATCH] fixing typo in cheat git --- cheatsheets/git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cheatsheets/git b/cheatsheets/git index 545dfbe..82decb4 100644 --- a/cheatsheets/git +++ b/cheatsheets/git @@ -22,6 +22,6 @@ 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 checkout master # Checkout local master branch git merge upstream/master # Merge remote into local repo