Crash course in git and github
•
3 likes•157 views
This is a crash course in git and github. In this presentation we'll cover git basics like staging/index, commits, branching, merging and remotes. We'll also walk through some collaboration scenarios like creating pull requests and resolving merge conflicts. Author: Mithun Shanbhag
More Related Content
What's hot
What's hot (20)
Similar to Crash course in git and github
Similar to Crash course in git and github (20)
More from Mithun Shanbhag
Recently uploaded
Recently uploaded (20)
Crash course in git and github
- 1. Crash course in Git and Github www.skewcode.com
- 2. Table of Contents ● DVCS ● Git - Installation ● Git - Basic concepts ● Git - Branches ● Git - Remotes ● Git - Remote tracking branches ● Git - Merging ● References
- 3. Distributed version control system v2 CENTRAL REPOSITORY VERSION HISTORY v1 v3 v2v1 v3 CENTRAL REPOSITORY VERSION HISTORY v2v1 v3 COMPUTER A VERSION HISTORY v2v1 v3 COMPUTER B VERSION HISTORY DVCS COMPUTER A COMPUTER B VCS FILE 1 FILE 2 FILE 4 FILE 5
- 4. Git - Installation Installation ○ https://git-scm.com/ ○ sudo apt-get install git-all ○ brew install git Configuration ○ git config --global user.name "Rahul Sharma" ○ git config --global user.email rahulsharma@gmail.com ○ git config --global color.ui auto ○ git config --global core.editor "code --wait" ○ git config --list
- 5. Git - Installation Creating a new local repository ● mkdir mysourcerepo ● cd mysourcerepo ● git init Cloning an existing remote repository ● mkdir mysourcerepo ● git clone https://github.com/skewcode/101-github.git mysourcerepo
- 6. Git - Basic Concepts working directory staging area (index)Local repository / commits (.git folder) git add git commit X1 X1X1 git diff git diff --staged Remote repository / commits (github) X1 git push git status git fetch or git pull
- 7. Git - Basic Concepts working directory staging area (index)Local repository / commits (.git folder) git add git commit X1 X1X2X1 X2 X2 git log
- 8. Git - Remotes Local repository Remote repository (github) git remote -v https://github.com/skewcode/101-gitdemo.git
- 9. Git - Branches working directory staging area (index)Local repository (commits) git add git commit X1 X1X2X1 X2 X2 mastermaster X3 X3X3 master
- 10. Git - Branches working directory staging area (index)Local repository (commits) git add git commit X1 X1X2X1 X2 X2 mastermaster X3 X3 X3 devbranch devbranch git branch devbranch git checkout devbranch X4 master git checkout master X4 X4
- 11. Git - Remote tracking branches Local repository X2X1 X3 master X2 X3X1 mastermastermaster origin/master Remote repository git fetch origin X4 master X5 master X4 origin/master git branch -vv
- 12. Git - Merging (fast-forward) working directory staging area (index)Local repository (commits) git add git commit X1 X1X2X1 X2 X2 mastermaster X3 X3X3 devbranch devbranch git branch devbranch git checkout devbranch master git checkout master git merge devbranch
- 13. Git - Merging (three-way) working directory staging area (index)Local repository (commits) git add git commit X1 X1X2X1 X2 X2 mastermaster X3 X3 X3 devbranch devbranch git branch devbranch git checkout devbranch X4 master git checkout master X4 X4 git merge devbranch X5 master
Editor's Notes
- What is version control? VCS vs DVCS
- 1: Install vscode. The vscode executable “code” will automatically be added to PATH on windows, linux. 2: [For mac only] CMD + P, >Shell Command: Install ‘code’ in PATH
- 1: A ‘commit’ is a snapshot of the ‘index’.
- Git clone automatically sets up the remote “origin”
- Why branching is needed? Branch is a pointer to latest commit. HEAD
- Git clone automatically sets up both the remote “origin” and the remote-tracking branch. Remote-tracking branches act as bookmarks to remind you where the branches in your remote repositories were the last time you connected to them. To synchronize, run git fetch To create remote-tracking branch: git clone Format of remote-tracking branch: remote / branch To fetch a remote branch: git fetch (note: read-only copy of branch) To create a local, editable copy: git merge or git checkout -b [branch] remote/branch Git checkout [branch] (will be created if doesn’t exist + remote branch name exists) Set upstream for existing branch