From db24cc62d9b9db0275e2db0c9110b86c2b887c68 Mon Sep 17 00:00:00 2001
From: Anders Riutta <ariutta@users.noreply.github.com>
Date: Tue, 24 Mar 2020 11:08:20 -0700
Subject: [PATCH] Create basics.md

Copied over almost unchanged from https://github.com/ariutta/git-primer/edit/master/README.md
---
 Using-git-and-github/basics.md | 99 ++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 Using-git-and-github/basics.md

diff --git a/Using-git-and-github/basics.md b/Using-git-and-github/basics.md
new file mode 100644
index 0000000..02ce7c5
--- /dev/null
+++ b/Using-git-and-github/basics.md
@@ -0,0 +1,99 @@
+# git basics ([cheatsheet](https://services.github.com/on-demand/downloads/github-git-cheat-sheet.pdf), [docs](https://git-scm.com/docs))
+Git is a technology that allows you to efficiently save and manage multiple versions of the code for a project. The collection of different versions is called a repository, and multiple users can each have their own repository for the same project. Each repository can serve as a source from which other repositories can pull and a destination to which other repositories can push -- it's distributed. Many sites host git repositories and add a web-based interface, such as GitHub, Bitbucket and GitLab. This primer is focused on using git from the command line, but some people use a GUI, such as [GH Desktop](https://desktop.github.com/) or [EGit](http://www.eclipse.org/egit/).
+
+## Get Started (First Time)1
+
+```bash
+git config --global user.name "Jay Doe"
+git config --global user.email jdoe@example.org
+```
+
+## Clone a Repo (GitHub)
+Sign into your GitHub account and visit the desired repository, e.g., [git-primer](https://github.com/gladstone-institutes/git-primer). Click the "Fork" button in the upper right, and when your fork is created, click the green "Clone or download" button to copy the URL, e.g., `https://github.com/gladstone-institutes/git-primer.git`, to your clipboard. Then open your terminal to create a local version of the repository from the command line (your copied URL should have your GitHub username instead of `gladstone-institutes`):
+
+```bash
+git clone https://github.com/gladstone-institutes/git-primer.git
+cd git-primer
+```
+
+## Work with Git
+
+Check status.
+```bash
+git status
+```
+
+Create a new branch named `my-feature` and push it to GitHub. It's a good idea to keep your active development in a separate branch from master so that master is always in the last known good state. For more information, see [our git workflows document](https://github.com/gladstone-institutes/git-primer/blob/master/workflows.md).
+```bash
+git checkout -b my-feature
+git push origin my-feature
+```
+
+Make some changes.
+```bash
+mkdir my-dir
+touch my-dir/my-file.txt
+```
+
+Commit your work (do this often).
+```bash
+git add ./my-dir/my-file.txt
+git commit ./my-dir/my-file.txt -m "create my file"
+```
+
+Sync with GitHub (remote).
+```bash
+git pull origin my-feature
+```
+
+If someone else was working on the branch, you may need to merge their work with yours. Git gives you [many different options](https://git-scm.com/docs/merge-strategies) for doing this, but most often, you can just use this procedure:
+
+```bash
+git mergetool
+```
+
+Select your preferred tool and complete the merge. If you select Opendiff, just use the GUI and save your merge. If you select Vim, follow these instructions:
+
+>```
+> ----------------------------------------
+> |            |            |            |
+> |   LOCAL    |    BASE    |   REMOTE   |
+> |            |            |            |
+> ----------------------------------------
+> |                                      |
+> |                 MERGED               |
+> |                                      |
+> ----------------------------------------
+>```
+>
+> Use `]c` to jump to the next difference. Then get version from one of the three options above:
+> * `:diffget LO`
+> * `:diffget BA`
+> * `:diffget RE`
+> 
+> When complete, save and exit with `:wqa`.
+
+Commit your merge (if you needed to merge) and push to GitHub:
+
+```bash
+git push origin my-feature
+```
+
+When your changes are production ready, merge your work into your local master branch.
+```bash
+git checkout master
+git diff my-feature # optional
+git merge my-feature
+```
+
+Push to GitHub (remote).
+```bash
+git pull origin master
+git push origin master
+```
+
+Delete feature branch both locally and at GitHub.
+```bash
+git branch -d my-feature
+git push origin -d my-feature
+```