Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Sign up for free
Menu
Search
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Features
All features
Private URLs
Password Protection
Custom URLS
Scheduled publishing
Remove Branding
Restrict embedding
Deck Collections
Notes
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Explore
Featured decks
Featured speakers
Programming
Technology
Storyboards
Pricing
Search
Sign in
Sign up for free
Git Hands-On
Search
Kenichi Takahashi
October 01, 2014
Programming
6.7k
10
Share
Embed
Copy iframe code
Copy JS code
Copy link
Start on current slide
Git Hands-On
新卒エンジニア研修で使った資料です。
Kenichi Takahashi
October 01, 2014
Transcript
63 slides
GMO Pepabo, Inc. Kenichi TAKAHASHI 2014/10/01 ৽ଔΤϯδχΞݚम Git Hands-On
,FOJDIJ5",")"4)* IUUQTIVDSFBNOFU UXJUUFS!LFODIBO HJUIVCLFODIBO +PJOPO"QS ! (FOUPP 'VOUPP
-JOVY 5JMJOH8JOEPX.BOBHFS ,JOFTJT$POUPVSFE,FZCPBSE !
$POUFOUT αϒίϚϯυͱNBO ίϛοτɺϒϥϯνɺλά NFSHFͱSFCBTF
αϒίϚϯυͱNBO
mkdir git-hands-on cd git-hands-on git init
touch README.md git status
git add README.md
git status
git commit -m ‘initial commit’
man git-commit
&YFSDJTFT HJUMPHͷNBOΛݟͯɺͬͨ͜ͱ ͷͳ͍ΦϓγϣϯΛࢼͯ͠ΈΑ͏
echo ‘# Git Tutorial’ > README.md
git diff
git add -u
man git-add
git diff --staged
git commit -m ‘Add title’
git log
3FDBQ αϒίϚϯυͱNBOͷ͍ํ εςʔδͱ͍͏֓೦
"EWBODFE&YFSDJTFT HJUEJ⒎TUBHFEΛ࣮ߦ͢Δαϒί ϚϯυɺHJUETΛ࡞ͬͯΈΑ͏
mkdir bin ! echo "\!#/bin/sh\n\ngit diff -- staged" > bin/git-ds
! chmod +x bin/git-ds ! PATH=./bin:$PATH git ds
ίϛοτ ϒϥϯν λά
git log git log --oneline git log --oneline --decorate
man git-log
git tag v0.0.1
git log --oneline --decorate
git branch update-readme
git log --oneline --decorate
&YFSDJTFT DPNNJUɺCSBODIɺUBHԿ͕ҧ͏ ͷ͔͋ͬͯ͠ΈΑ͏
ޡղΛڪΕͣʹݴ͏ͱ commitͷϋογϡͷผ໊͕ ϒϥϯνɺλά
git log --oneline --decorate
HEADࠓ͍Δίϛο τΛࠩ͢ϙΠϯλ
git checkout (Ұͭલͷίϛοτ) git log --online --decorate
git checkout master git log --oneline --decorate
&YFSDJTFT NBTUFSͷҰͭલͷίϛοτΛ DIFDLPVU͠ɺ3&"%.&Λमਖ਼͠ ͯίϛοτͯ͠ΈΑ͏ ͜ͷͱ͖ɺίϛοτͷάϥϑ͕Ͳ͏ ͳ͍ͬͯΔ͔ߟ͑ͯΈΑ͏
git checkout HEAD~ echo 'hello antipop' >> README.md ! git
add -u git commit -m 'Lost commit' ! git log --oneline --decorate ! git checkout master ! git log --oneline --decorate
3FDBQ ϩάίϛοτͷ࿈ͳΓ UBH CSBODIDPNNJUͷผ໊ )&"%ࠓ͍Δͱ͜ΖΛࠩ͢ϙΠϯ λ
"EWBODFE&YFSDJTF ḷΕͳ͘ͳͬͨίϛοτΛ෮چ͢Δ ํ๏ΛΒͯΈΑ͏
NFSHFͱSFCBTF
git checkout update-readme
echo 'hello hsbt' >> README.md ! git diff ! git
add -u ! git commit -m 'Hello hsbt'
echo 'Konichiwa Rails' >> README.md ! git diff ! git
add -u ! git commit -m 'Konichiwa Rails' ! git log --oneline --decorate
git checkout master
touch History.md ! git add History.md ! git commit -m
'Create History.md’ ! git log --oneline --decorate !
git merge update-readme
&YFSDJTF T NFSHFίϛοτΛΈͯίϛοτͷܨ ΓΛ૾ͯ͠ΈΑ͏
"EWBODFE&YFSDJTFT ͠ɺNBTUFSʹίϛοτ૿͑ͯͳ ͔ͬͨͱ͖ͷϚʔδʹ͍ͭͯௐͯ ΈΑ͏ ώϯτ'BTU'PSXBSE
git checkout -b hello-swift ! echo 'Hello Swift' > Swift.md
! git add Swift.md ! git commit -m 'Add Swift.md'
git checkout master ! echo 'Hello Android' >> README.md !
git add -u ! git commit -m ‘Hello Android'
git checkout hello-swift
git log --oneline --decorate ! (ίϛοτΛϝϞ͓ͯ͜͠͏)
git rebase master
git log --oneline --decorate
&YFSDJTFT SFCBTFʹΑͬͯίϛοτͷܨ͕Γ ͕Ͳ͏มΘͬͨͷ͔૾ͯ͠ΈΑ͏ ϝϞ͓͍ͯͨ͠ίϛοτΛDIFDLPVU ͯ͠ɺHJUMPHΛݟͯΈΑ͏
3FDBQ HJUNFSHFͭͷίϛοτΛઌ ʹ࣋ͭίϛοτΛ࡞Δ HJUSFCBTFίϛοτ͔ΒύονΛ ࡞ͬͯɺͦΕΛҰ͍ͭͣͭͯͯ͘
"EWBODFE&YFSDJTFT NFSHFͱSFCBTFͰͦΕͧΕίϯϑ ϦΫτͷղܾํ๏ʹ͍ͭͯ͋ͬͯ ΈΑ͏
·ͱΊ
$POUFOUT αϒίϚϯυͱNBO ίϛοτɺϒϥϯνɺλά NFSHFͱSFCBTF
αϒίϚϯυͱNBO NBOͷ͍ํ εςʔδͱ͍͏֓೦
ίϛοτɺϒϥϯνɺλά ϩάίϛοτͷ࿈ͳΓ UBH CSBODIDPNNJUͷผ໊ )&"%ࠓ͍Δͱ͜ΖΛࠩ͢ϙΠϯ λ
NFSHFͱSFCBTF HJUNFSHFͭͷίϛοτΛઌ ʹ࣋ͭίϛοτΛ࡞Δ HJUSFCBTFίϛοτ͔ΒύονΛ ࡞ͬͯɺͦΕΛҰ͍ͭͣͭͯͯ͘
ଓ͖ Pro Git http://progit-ja.github.io/
"OZ2VFTUJPOT
More Decks by Kenichi Takahashi
See All by Kenichi Takahashi
Claude Code全社展開のためにやったことn選~プラグイン302個・コミッター271人を支えるために~
kenchan
5
2.1k
実践、マルチクラウド環境でのコスト管理の現状と未来
kenchan
0
240
エンジニアリング 💰Moneyジャー / Engineering Money-ger
kenchan
3
1.2k
Lv1,2の開発生産性を経営と繋ぐ
kenchan
4
2.3k
「トップ10プランナー」からはじめる目標設定
kenchan
5
4.7k
負債と言わないことが負債と向き合うこと
kenchan
5
4.9k
可用性No.1へ!「カラーミーショップ」のリ・アーキテクティング
kenchan
0
210
カラーミーショップは私たちが作っています
kenchan
0
1.9k
カラーミーショップ 2022 / COLORME SHOP 2022
kenchan
0
780
Other Decks in Programming
See All in Programming
Snowflake Openflow Connector利用の勘所 / 20261024developersio2026tokyo-snowflake-openflow
kasacchiful
PRO
0
340
imagewebp()の向こう側: WebPはなぜ JPEG・PNGより軽いのか
yuzneri
0
110
SODA - FACT BOOK(EN)
sodainc
1
250
手の動かし方がわからなかった私が個人開発者になるまで
usagi0920_pochi
0
110
[DroidKnights 2026] Workflow AX: From Auto-Documented Policies to E2E Testing
raeminkang
0
580
Seven New Principles of Software Engineering
yegor256
0
500
Augmenting AI with the Power of Jakarta EE
ivargrimstad
0
340
LLM 101
dalinaum
0
500
AI時代のシニアエンジニアとは
yosuke_furukawa
PRO
15
12k
조합이폭발하는디자인시스템이걸눈으로도테스트하라고요
giljongyu
0
770
社内AIエージェント「Askワンバン」における コストチューニングの取り組み
t0yohei
0
170
なぜ私たちは「現時点では」KMPの導入を見送ったのか
chigichan24
1
280
Featured
See All Featured
Reality Check: Gamification 10 Years Later
codingconduct
0
2.4k
A Tale of Four Properties
chriscoyier
163
24k
Visualization
eitanlees
153
17k
The Limits of Empathy - UXLibs8
cassininazir
2
790
The Mindset for Success: Future Career Progression
greggifford
PRO
0
560
The SEO Collaboration Effect
kristinabergwall1
1
620
The Director’s Chair: Orchestrating AI for Truly Effective Learning
tmiket
1
350
Understanding Cognitive Biases in Performance Measurement
bluesmoon
32
3.1k
Believing is Seeing
oripsolob
1
280
Lightning talk: Run Django tests with GitHub Actions
sabderemane
0
320
Groundhog Day: Seeking Process in Gaming for Health
codingconduct
0
480
Abbi's Birthday
coloredviolet
5
11k