notes/git.md

20 lines
528 B
Markdown
Raw Normal View History

2018-05-21 11:55:41 -04:00
Branches
============================================
### Adding Branches ###
* local: `git checkout -b <branch>`
* remote: `git push --set-upstream <remote> <branch>`
* track remote: `git checkout --track <origin>/<branch>`
### Deleting Branches ###
* local: `git branch -d <name>`
* remote: `git push -d <remote> <name>`
* realize remote deletes: `git remote prune <remote>`
### Non-Standard Activities ###
* merge only a single file into another branch `git checkout <branch> -- <file>`
* do not track `git rm <file>`