Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Features
Speaker Deck
PRO
Sign in
Sign up for free
Search
Search
Git a life
Search
Filippo Gangi Dino
June 23, 2017
Programming
0
300
Git a life
A simple introduction about GIT and versioning.
Filippo Gangi Dino
June 23, 2017
Tweet
Share
More Decks by Filippo Gangi Dino
See All by Filippo Gangi Dino
talk_sui_talk_WP_Meetup.pdf
mukkoo
0
180
Bug Hunt
mukkoo
0
110
Survive heisenbug in micro service architecture
mukkoo
1
100
WordFlow (WordPress WorkFlow)
mukkoo
0
93
What is git?
mukkoo
0
110
Around Angular2
mukkoo
0
100
Talk sui talk
mukkoo
1
180
Road to ES6
mukkoo
1
150
Middleman
mukkoo
0
210
Other Decks in Programming
See All in Programming
Foundation Modelsを実装日本語学習アプリを作ってみた!
hypebeans
0
130
TFLintカスタムプラグインで始める Terraformコード品質管理
bells17
2
450
はじめてのDSPy - 言語モデルを『プロンプト』ではなく『プログラミング』するための仕組み
masahiro_nishimi
4
16k
bootcamp2025_バックエンド研修_WebAPIサーバ作成.pdf
geniee_inc
0
130
What's new in Spring Modulith?
olivergierke
1
170
Six and a half ridiculous things to do with Quarkus
hollycummins
0
210
Android16 Migration Stories ~Building a Pattern for Android OS upgrades~
reoandroider
0
140
Vueのバリデーション、結局どれを選べばいい? ― 自作バリデーションの限界と、脱却までの道のり ― / Which Vue Validation Library Should We Really Use? The Limits of Self-Made Validation and How I Finally Moved On
neginasu
2
1.6k
One Enishi After Another
snoozer05
PRO
0
160
Building, Deploying, and Monitoring Ruby Web Applications with Falcon (Kaigi on Rails 2025)
ioquatix
4
2.5k
React Nativeならぬ"Vue Native"が実現するかも?_新世代マルチプラットフォーム開発フレームワークのLynxとLynxのVue.js対応を追ってみよう_Vue Lynx
yut0naga1_fa
2
1.5k
Catch Up: Go Style Guide Update
andpad
0
250
Featured
See All Featured
GitHub's CSS Performance
jonrohan
1032
470k
Six Lessons from altMBA
skipperchong
29
4k
Dealing with People You Can't Stand - Big Design 2015
cassininazir
367
27k
A designer walks into a library…
pauljervisheath
209
24k
Building a Modern Day E-commerce SEO Strategy
aleyda
44
7.8k
Optimising Largest Contentful Paint
csswizardry
37
3.5k
How to Think Like a Performance Engineer
csswizardry
27
2.1k
Designing Dashboards & Data Visualisations in Web Apps
destraynor
231
53k
4 Signs Your Business is Dying
shpigford
185
22k
How STYLIGHT went responsive
nonsquared
100
5.9k
VelocityConf: Rendering Performance Case Studies
addyosmani
333
24k
Keith and Marios Guide to Fast Websites
keithpitt
411
23k
Transcript
GIT A LIFE
@MUKKOO
@mukkoo
@mukkoo
@mukkoo
VErsioning @mukkoo Version Control System
Copy & Paste VCS @mukkoo project/ project_old/ project_old_old/ project_ok/ project_ok_ok/
project_ok_ok_new/ projectOK_ok_ok_new/
Centralized VCS @mukkoo CVS, Subversion, Perforce Server Repository Client Client
Client Client
Distributed VCS @mukkoo Git, Mercurial, Bazaar Hub Repository Server Server
Server Server Repository Repository Repository Repository
GIT* @mukkoo *idiot
Linus Torvalds
focus @mukkoo 1. Make the opposite of CVS (SVN) 2.
Distributed workflow 3. Safe against file corruption 4. High performance
Snapshot not DIFF @mukkoo 0 +2 +4 -3/2 DIFF: Every
commit record differences 0 2 6 1,5 SNAPSHOT: Every commit record all file tree
Three States @mukkoo Git Directory Working Directory Staging Area Untracked
Committed
WARNING!!! the hardest part is coming.
Branching @mukkoo c1 c2 master HEAD feature
Branching @mukkoo c1 c2 master HEAD feature c3 c4 c5
c6 feature2
@mukkoo Need fix on master. NOW!
Branching @mukkoo c1 c2 master HEAD feature c3 c4 c5
c6 feature2 c7 c8
Branching @mukkoo c1 c2 master HEAD feature c3 c4 c7
c8 c9
The Theory is Over @mukkoo Are you hungry?
Commands @mukkoo
INIT @mukkoo $ git init
status @mukkoo $ git status show the working tree status
ADD @mukkoo $ git add <args> add file to staging
area
Commit @mukkoo $ git commit -m “message” record changes
LOG @mukkoo $ git log Show commits log
checkout - - @mukkoo $ git checkout -- <file> Restore
a modified file
branch @mukkoo $ git branch <branch_name> Create a new branch
checkout @mukkoo $ git checkout <branch_name> Move to branch
merge @mukkoo $ git merge <branch_name> merge branch
DEMO TIME @mukkoo
Useful concepts @mukkoo
remotes (command and concept) fetch (command) push/pull (commands) @mukkoo Network
rebase (command) fast forward (concept) stashing (command) @mukkoo FLOW
ignoring files (.gitignore) gitk and git gui (gui tools) shortcut
and configs (.gitconfig) @mukkoo Settings and tools
Q&A @mukkoo
what does Wordpress use? @mukkoo
GIT A SLICE of pizza @mukkoo