40 lines
1.1 KiB
Markdown
40 lines
1.1 KiB
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`
|
|
this should force git to checkout code using OS default line endings
|
|
* store credentials `git config credential.helper store` or `git config credential.helper cache`
|
|
|
|
.gitignore
|
|
================================================
|
|
|
|
[Git - gitignore Documentation (git-scm.com)](https://git-scm.com/docs/gitignore)
|
|
|
|
* `.obsidian/` ignores the .obsidian directory
|
|
|
|
to untrack files `git rm --cached .\.vscode\`
|
|
|