pt/notes
1
0
Fork 0
Code Issues 1 Pull Requests Projects 1 Releases Wiki Activity

vault backup: 2023-01-12 19:45:43

Browse Source
This commit is contained in:
Paul Trowbridge 2023-01-12 19:45:43 -05:00
parent be034057e0
commit a44dab9704
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
git.md
View File

@ -1,28 +1,29 @@
Branches Branches
============================================ ============================================
### Adding Branches ### Adding Branches
* local: `git checkout -b <branch>` * local: `git checkout -b <branch>`
* remote: `git push --set-upstream <remote> <branch>` * remote: `git push --set-upstream <remote> <branch>`
* track remote: `git checkout --track <origin>/<branch>` * track remote: `git checkout --track <origin>/<branch>`
### Deleting Branches ### Deleting Branches
* local: `git branch -d <name>` * local: `git branch -d <name>`
* remote: `git push -d <remote> <name>` * remote: `git push -d <remote> <name>`
* realize remote deletes: `git remote prune <remote>` * realize remote deletes: `git remote prune <remote>`
### Non-Standard Activities ### Non-Standard Activities
* merge only a single file into another branch `git checkout <branch> -- <file>` * merge only a single file into another branch `git checkout <branch> -- <file>`
* delete from repo and file system `git rm <file>` * delete from repo and file system `git rm <file>`
* set current branch to track remote `git branch -u <origin>/<branch>` * set current branch to track remote `git branch -u <origin>/<branch>`
Config Config
============================================= =============================================
* set line ending behaviour `git config --global core.autocrlf true` * set line ending behaviour `git config --global core.autocrlf true`
* store credentials `git config credential.helper store` or `git config credential.helper cache` 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`