Merge branch 'master' of https://github.com/fleetside72/notes

2018-06-15 00:22:23 -04:00 · 2018-06-15 00:22:23 -04:00 · aaf3873b1d
commit aaf3873b1d
parent 8c580d23f1 8e782669d4
1 changed files with 2 additions and 1 deletions
--- a/git.md
+++ b/git.md
@ -17,4 +17,5 @@ Branches
 ### Non-Standard Activities ###

 * 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>`