Merge pull request #42 from carlosp420/master

fixing typo in cheat git
This commit is contained in:
Chris Lane 2013-09-01 10:14:50 -07:00
commit 74eca97b62
2 changed files with 4 additions and 1 deletions

View File

@ -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

View File

@ -9,3 +9,6 @@ echo 'It is daytime' | sed 's/day/night/g'
# To remove leading spaces
sed -i -r 's/^\s+//g' file.txt
# To remove empty lines
cat file.txt | sed '/^$/d'