Git Tutorial

© All rights reserved: Moshe Kaplan© All rights reserved: Moshe Kaplan Git for BillRun!© All rights reserved: Moshe Kaplan© All rights reserved: Moshe Kaplan Git for BillRun!
GitFor BillRun!
Copyrights © Moshe Kaplan
moshe.kaplan@brightaqua.com

Git
For BillRun!
Moshe Kaplan
Scale Hacker
http://top-performance.blogspot.com
http://blogs.microsoft.co.il/vprnd

© All rights reserved: Moshe Kaplan© All rights reserved: Moshe Kaplan Git for BillRun!
It’s all About
3
Scale

SOURCE CONTROL AND GIT
Introduction
4

GIT History
2002
Linus Torvald uses BitKeeper for tracking Linux
April, 2005
Linus writes his own SCM, GIT
June, 2005
GIT is officially used to track Linux

Centralize VCS: C/S Model
Pros
• All versions of elements located on one place.
• Metadata & History are monosemantic
• Access control (permissions and triggers)
Cons
• Backup process is generally very complex
and needs downtime.
• Performance
• Dependence on Network status
Slide 6

Distributed VCS: Everybody is an owner
Pros
• No server necessary
• It’s fast.
• Backup process is trivial + no downtime
Cons
• The distributed model is harder to understand.
• The revisions are not incremental numbers,
which make them harder to reference.
• Needs enough disk space for full repository and
work area on the client machine
• Potential loss of all changes until “push” operation

Why Git?
• Decentralized
• Works offline (default)
• Flexible
• Lightweight
• Widely supported
• Better control

GIT Pros and ConsPros
• Resilience: No one repository has more data than any other
• Speed: Very fast operations compared to other VCS
• Space: Very effective compression mechanism
• Simplicity Object model is very simple
• Multi Platforms GIT supports all relevant OSs and all last Kernels
• Easy client installation Very simple installation and configuration procedure.
• OSS: GNU GPLv2.
Cons
• GIT does not have central support group.
• Version tree of file is absent & branches/commits tree is not intuitive.
• The revisions are not incremental numbers, which make them harder to reference
• Needs enough disk space for full repository and work area on the client machine
• Possible loss of all changes until “push” operation to one of “blessed” repos
• Commit messages are per changeset.
• Git does not track empty folders
• Git is really bad solution for big binaries in source control

De facto Standard

Git theory and objects
http://blogs.mathworks.com/seth/2014/04/17/social-collaboration-using-git-for-model-based-design/

Git submodules
• Link to external code repository
• Most useful for shared libraries
http://paynedigital.com/articles/2011/10/introduction-to-git-submodules

Hooks
http://www.slideshare.net/bradleyd60/git-hooks-for-front-end-developers-52192325

Gitflow
Common Methodology

Build Machines and Continues deployments
15
http://tapetim.diq.co.il/36__The_Matrix,_1999,_Green_Falling_Code.htm
http://community.sharpdevelop.net/blogs/mattward/pages/FeatureTourUnitTesting.aspx
http://www.javalinux.it/wordpress/2008/05/19/subversion-branching-in-my-experience/
http://www.nytimes.com/2008/04/20/magazine/20Build-text.html
Automatic Tests
Merge to
Trunk
Feature
CODE
P1
P2
P3
Feedback

Client Tools: Command Line
• http://git-scm.com/download/win

Client Tools: SourceTree

Eclipse for PHP
https://eclipse.org/pdt/

Git/Eclipse Integration
http://www.eclipse.org/egit/?gclid

Git Server Setup
• sudo apt-get install git-core
• sudo useradd git
• passwd git
• su git
• cd
• mkdir .ssh && chmod 700 .ssh
• touch .ssh/authorized_keys && chmod 600 .ssh/authorized_keys
• cd /opt/git
• mkdir project.git
• cd project.git
• git init --bare
https://git-scm.com/book/en/v2/Git-on-the-Server-Setting-Up-the-Server

First User Project
• cd myproject
• git init
• git add .
• git commit -m 'initial commit'
• git remote add origin git@gitserver:/opt/git/project.git
• git push origin master

Other Users
• git clone git@gitserver:/opt/git/project.git
• cd project
• vim README
• git commit -am 'fix for the README file'
• git push origin master

Eclipse/Git
1. File > Import 2. Team > Share Project 3. Git Ops

GETTING TO WORK GIT
Working
24

Basic bash Commands
ls list files in current directory
cd change current directory
touch create a new blank file
rm remove a file
mv “move” - rename file
mkdir create a new directory
rmdir remove a directory
rm -rf remove directory and contents
more show the contents of a file

Creating a repository
• git init <optional directory if not current>
• git add <file or directory name>
• git status

simone.soldateschi@rackspace.co.uk
Recap - The three states

Basic commands

Personal configuration
• Configure your git installation
• git config user.name <name>
• In current repository
• git config --global user.name <name>
• For all commits
• git config --global user.email <email>
• git config --global alias.<alias-name> <git-command>

Where is it stored?
• Repository-specific settings
• <repo>/.git/config
• Where options set with the --global flag are stored
• ~/.gitconfig – User-specific settings.
• System-wide settings
• $(prefix)/etc/gitconfig

Commits

What’s in a commit?
• Always Commit!
• Snapshots are committed to local repository
• Always lookups and complete files
• Much faster

Creating commits
• Before commit always diff…
• git commit
• git commit -m “message”
• w/ message: use present tense readable comments!
• git commit –a
• To all files in tracked directory

Amending commits
• History Rewrite… May cause loss of code!
• Used mostly to fix error in the previous commit
• Actually a complete new commit
• Only for private commits!
• git commit --amend

Ignoring Files
• To Avoid Status Notifications
• .gitignore file
• Add relevant files such as compiled files: *.pyc

Logs
• List, filter and search the snapshot log
• git log
• All logs
• git log –n <N>
• Last N commits
• git log <file name>
• Used for blaming

Lab
• Basic work w/ Git
• 1. Create new repository
• 2. Add and Commit initial file README.txt
• 3. Modify and Commit initial file README.txt
• 4. Inspect log

TEAM WORK IN GIT
Work
38

pull
do stuff
push

local actions
and objects
remote
actions
and objects

Diffs
• git status
• diff --git a/demo.txt b/demo.txt

Fixing mistakes
• git checkout <revision id> <specific file>
• Modify files
• git checkout master
• git commit
• git revert
• Add new commit
• git reset
• Remove commits

Fixing mistakes
git reset <commit>
• Get back to <commit> the staging area
• Working area left as previous enabling further commit
git reset --hard <commit>
• Working are is being reset as well
• No traces left
git reset --hard HEAD~2 Move back 2 commitsMove back 2 commits

Cleanup
• git clean
• Clean all untracked files
• git clean –n
• dry run
• git clean –df
• Clean all

Branches
• git checkout -b new-feature master
• Create a branch w/ new feature

Merging
• git fetch origin
• git merge origin/master

Cloning
• When working w/ existing projects
• git clone <repo> <directory>
• git clone
ssh://john@example.com/path/to/proj.git

Code Review
• git remote add <name> <url>
• Create link to peer repository
• git fetch <remote> <branch>
• Get Branch from peer repository
• git branch -r
• Show available remote branches

Rebasing and Upstreams
• git rebase <base>
• New Commits
• Move features
• Change snapshot pointers
• Mostly for integrating your local dev to remote that is more
advanced

Upstreams
• git pull == git fetch + git merge
• git pull <remote>
• git fetch <remote>
• git merge origin/<current-branch>
• git push <remote> <branch>

How to Do that?
• git checkout new-feature
• git rebase master
• git merge new-feature

Tags
• git tag -a <version> -m <commit message>
• git tag -a v1.0 -m ‘MVP launch’

Branches Illustrated
bug123
master
> git checkout –b bug123
A B C

master
> git checkout master
A B C
D E
bug123

bug123
master
> git merge bug123
A B C D E

master
A B C D E
F G
bug456

master
A B C D E
> git rebase master
F’
G
’
bug456

master
A B C D E
456
> git checkout master
> git merge bug456
F’
G
’
bug456

Developer GIT flow
 cd /home.local/<user>/git/<repo-name>/src/….
 git checkout [-b] <branch> (by default you are on master branch)
 Editing ↔ Compilation
 git add [<list of files/directories>|*|.] (add all relevant changes to changeset)
 git status (check the commit content)
 git pull (fetch & merge)
 git commit –m “comment” (local checkin)
 git show / git log
 git review [branch] (default branch is current one)
 git push [repo] [branch] (Just In the case you work without “Code review” system)

Feature & R&D owners flow
Feature Owner Flow
git clone ssh://<user>@server/<repo name>
cd <repo_path>
git checkout <feature>
git merge develop
git mergetool
git review
R&D Owner Flow
git clone ssh://<user>@server/GIT/<repo name>.git
cd <repo path>
git checkout develop
git merge <feature>
git push origin develop

Lab
• Group work w/ Git and BillRun:
• 1. Clone the code
• 2. Create an hotfix
• 3. Merge it to the develop branch

Thank You !
Moshe Kaplan
moshe.kaplan@brightaqua.com
054-2291978

Git Tutorial

Recommended

Recommended

More Related Content

What's hot

What's hot (20)

Similar to Git Tutorial

Similar to Git Tutorial (20)

More from Moshe Kaplan

More from Moshe Kaplan (20)

Recently uploaded

Recently uploaded (20)

Git Tutorial