Git/cheat
1
0
Fork 0
mirror of https://github.com/cheat/cheat.git synced 2024-11-22 14:01:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42 from carlosp420/master

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cheatsheets/git
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 remote -v # Confirm new remote repo
git fetch upstream # Get branches git fetch upstream # Get branches
git branch -va # List local - remote 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 git merge upstream/master # Merge remote into local repo

3
cheatsheets/sed
View File

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