From a44dab970474ed6e52edb446650172029885fa8d Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Thu, 12 Jan 2023 19:45:43 -0500 Subject: [PATCH] vault backup: 2023-01-12 19:45:43 --- git.md | 57 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/git.md b/git.md index 91855b5..7b1218b 100644 --- a/git.md +++ b/git.md @@ -1,28 +1,29 @@ - -Branches -============================================ - - -### Adding Branches - -* local: `git checkout -b ` -* remote: `git push --set-upstream ` -* track remote: `git checkout --track /` - -### Deleting Branches - -* local: `git branch -d ` -* remote: `git push -d ` -* realize remote deletes: `git remote prune ` - -### Non-Standard Activities - -* merge only a single file into another branch `git checkout -- ` -* delete from repo and file system `git rm ` -* set current branch to track remote `git branch -u /` - -Config -============================================= - -* set line ending behaviour `git config --global core.autocrlf true` -* store credentials `git config credential.helper store` or `git config credential.helper cache` + +Branches +============================================ + + +### Adding Branches + +* local: `git checkout -b ` +* remote: `git push --set-upstream ` +* track remote: `git checkout --track /` + +### Deleting Branches + +* local: `git branch -d ` +* remote: `git push -d ` +* realize remote deletes: `git remote prune ` + +### Non-Standard Activities + +* merge only a single file into another branch `git checkout -- ` +* delete from repo and file system `git rm ` +* set current branch to track remote `git branch -u /` + +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`