notes/git.md
Paul Trowbridge 63da9921c2 line feeds
2018-09-21 11:47:25 -04:00

26 lines
768 B
Markdown

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>`
* delete from repo and file system `git rm <file>`
* set current branch to track remote `git branch -u <origin>/<branch>`
Config
=============================================
* set line ending behaviour `git config --global core.autocrlf true`