git-cheatsheet

A quick reference for before your morning coffee.

• Basic
• Branching
  • Create new branch
  • Switch to a branch
  • Merge branches
  • Delete a branch locally
  • List
• Rollback
  • Restore file from a custom commit (in current branch)
• Tagging with semantic versioning
  • Bower
  • NPM
• Set remote
  • Add remote
  • Remove remote

#Branching ###Create a new branch

git checkout -b <name>

###Switch to a branch

git checkout <name>

###Merge branches

git checkout <branch to merge to>
git merge --no-ff <branch to merge from>

###Delete a branch locally

git branch -d <branch name>

###List branches

git branch [-a]

-a will list both local and remote branches

Rollback

Restore file from a custom commit (in current branch)

 git checkout 6eb715d -- index.html

#Tagging with semantic versioning

Bower

bower version patch|minor|major

NPM

npm version patch|minor|major

Set Remote

###Add remote URL

git remote add <name> <address>
#Example: git remote add origin https://github.com/rileyjshaw/git-cheatsheet.git

###Remove remote

git remote rm <name>