Git with GitHub

Get Started. It's Free
or sign up with your email address
Rocket clouds
Git with GitHub by Mind Map: Git with GitHub

1. Initial Setup


1.2. Store your creds

1.2.1. MAC tell git to put your next set of credentials in the OSX keychain git config --global credential.helper osxkeychain

1.2.2. PC

1.2.3. Linux/WSL

1.3. create a directory where you'll store your github repository. (You don't have to store them all in the same place, but it makes sense). EG ~/github or C:\github

1.4. setup w Visual Studio Code

1.4.1. Using SSH Keys in Visual Studio Code on Windows · cgranade::space

2. Day-to-Day Work

2.1. Oops! Did you start doing work before creating a new branch?

2.1.1. No prob. create the branch. what matters is what branch you are in when you commit

2.2. create a branch and checkout

2.2.1. git checkout -b <branch> this combines git branch <branch> git checkout branch

2.3. do work

2.3.1. add changes to git (changed files, new files, new dir) git add <file or parent dir> [<file or dir> <file or dir>...] EG this tells git to track these files for changes

2.3.2. show git changes git diff git status git branch

2.3.3. commit work to the branch git commit -m "<change message>" until you do this, you really haven't done any work in the branch

2.3.4. push committed work to github first time pushing this branch? git push -u origin <branch> additional pushes git push

2.4. First: GitHub GUI

2.4.1. pull request

2.4.2. get approval

2.4.3. merge pull request

2.4.4. delete branch

2.5. Merge to Master & Clean Up

2.5.1. Clean up git status should be up-to-date git checkout master git pull if you need to pull changes others have made git pull origin master git branch -d <old_branch>

3. Get Started

3.1. clone a repo

3.1.1. need to do this before you work w a repo

3.1.2. git clone <url>

3.2. OR, create a new repo

3.2.1. Easiest: Create repo in github & clone Create repo in github clone repo (see above) add files (see Day-to-Day work)

3.2.2. OR, create a new repo from files that exist already gotta fill this in

4. CRAP! I goofed!

4.1. How Do I...

4.1.1. Roll back a pull request This is easy! In the GitHub GUI, go to your pull request, and there is a revert option (or undo or roll back or something like that)

4.1.2. Move a commit to master (that I did not push) to a new branch - or an existing branch? (Yup! I accidentally committed to master!) Move the most recent commit(s) to a new branch with Git more info on undoing a commit: How to With Git: Undo Commit -

5. Pulling from other branches

5.1. Pull latest from master

5.1.1. git merge orgin master

5.2. Pull latest from another branch

5.2.1. git fetch origin other-branch

5.2.2. git merge origin/other-branch

5.2.3. resolve your merge conflicts

5.2.4. git add ... (add your conflict fixes)

5.2.5. git commit ...

5.2.6. Reference

5.3. super article about branching

5.3.1. git: fetch and merge, don’t pull | Mark's Blog

6. Diff

6.1. compare two branches

6.1.1. get the URL of the repo, and add /compare/branch1..branch2 EG:

7. Point to specific code

7.1. use #L

7.1.1. EG url#L48