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
290
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
100
Survive heisenbug in micro service architecture
mukkoo
1
91
WordFlow (WordPress WorkFlow)
mukkoo
0
90
What is git?
mukkoo
0
100
Around Angular2
mukkoo
0
96
Talk sui talk
mukkoo
1
170
Road to ES6
mukkoo
1
140
Middleman
mukkoo
0
200
Other Decks in Programming
See All in Programming
可変変数との向き合い方 $$変数名が踊り出す$$ / php conference Variable variables
gunji
0
230
チームで開発し事業を加速するための"良い"設計の考え方 @ サポーターズCoLab 2025-07-08
agatan
1
490
ISUCON研修おかわり会 講義スライド
arfes0e2b3c
1
480
構文解析器入門
ydah
7
1.8k
ZeroETLで始めるDynamoDBとS3の連携
afooooil
0
120
テスターからテストエンジニアへ ~新米テストエンジニアが歩んだ9ヶ月振り返り~
non0113
2
240
副作用と戦う PHP リファクタリング ─ ドメインイベントでビジネスロジックを解きほぐす
kajitack
3
440
状態遷移図を書こう / Sequence Chart vs State Diagram
orgachem
PRO
3
260
チームのテスト力を総合的に鍛えて品質、スピード、レジリエンスを共立させる/Testing approach that improves quality, speed, and resilience
goyoki
6
1.2k
DMMを支える決済基盤の技術的負債にどう立ち向かうか / Addressing Technical Debt in Payment Infrastructure
yoshiyoshifujii
4
600
The Evolution of Enterprise Java with Jakarta EE 11 and Beyond
ivargrimstad
0
470
マッチングアプリにおけるフリックUIで苦労したこと
yuheiito
0
240
Featured
See All Featured
RailsConf 2023
tenderlove
30
1.2k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
chriscoyier
507
140k
Why Our Code Smells
bkeepers
PRO
337
57k
A Tale of Four Properties
chriscoyier
160
23k
The Language of Interfaces
destraynor
158
25k
Keith and Marios Guide to Fast Websites
keithpitt
411
22k
Building Better People: How to give real-time feedback that sticks.
wjessup
367
19k
Thoughts on Productivity
jonyablonski
69
4.7k
Easily Structure & Communicate Ideas using Wireframe
afnizarnur
194
16k
We Have a Design System, Now What?
morganepeng
53
7.7k
Refactoring Trust on Your Teams (GOTO; Chicago 2020)
rmw
34
3.1k
Code Reviewing Like a Champion
maltzj
524
40k
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