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 Hands-On
Search
Kenichi Takahashi
October 01, 2014
Programming
10
6.6k
Git Hands-On
新卒エンジニア研修で使った資料です。
Kenichi Takahashi
October 01, 2014
Tweet
Share
More Decks by Kenichi Takahashi
See All by Kenichi Takahashi
実践、マルチクラウド環境でのコスト管理の現状と未来
kenchan
0
110
エンジニアリング 💰Moneyジャー / Engineering Money-ger
kenchan
2
730
Lv1,2の開発生産性を経営と繋ぐ
kenchan
4
2k
「トップ10プランナー」からはじめる目標設定
kenchan
5
4k
負債と言わないことが負債と向き合うこと
kenchan
5
4.2k
可用性No.1へ!「カラーミーショップ」のリ・アーキテクティング
kenchan
0
150
カラーミーショップは私たちが作っています
kenchan
0
1.6k
カラーミーショップ 2022 / COLORME SHOP 2022
kenchan
0
690
Amazon RDS移行のための 性能検証でわかった2つのこと
kenchan
3
4.1k
Other Decks in Programming
See All in Programming
請來的 AI Agent 同事們在寫程式時,怎麼用 pytest 去除各種幻想與盲點
keitheis
0
120
知っているようで知らない"rails new"の世界 / The World of "rails new" You Think You Know but Don't
luccafort
PRO
1
150
パッケージ設計の黒魔術/Kyoto.go#63
lufia
3
440
[FEConf 2025] 모노레포 절망편, 14개 레포로 부활하기까지 걸린 1년
mmmaxkim
0
1.6k
Swift Updates - Learn Languages 2025
koher
2
470
モバイルアプリからWebへの横展開を加速した話_Claude_Code_実践術.pdf
kazuyasakamoto
0
330
HTMLの品質ってなんだっけ? “HTMLクライテリア”の設計と実践
unachang113
4
2.8k
為你自己學 Python - 冷知識篇
eddie
1
350
複雑なドメインに挑む.pdf
yukisakai1225
5
1.2k
@Environment(\.keyPath)那么好我不允许你们不知道! / atEnvironment keyPath is so good and you should know it!
lovee
0
120
「手軽で便利」に潜む罠。 Popover API を WCAG 2.2の視点で安全に使うには
taitotnk
0
860
AI Coding Agentのセキュリティリスク:PRの自己承認とメルカリの対策
s3h
0
220
Featured
See All Featured
Sharpening the Axe: The Primacy of Toolmaking
bcantrill
44
2.5k
How to Create Impact in a Changing Tech Landscape [PerfNow 2023]
tammyeverts
53
2.9k
Product Roadmaps are Hard
iamctodd
PRO
54
11k
Practical Tips for Bootstrapping Information Extraction Pipelines
honnibal
PRO
23
1.4k
Save Time (by Creating Custom Rails Generators)
garrettdimon
PRO
32
1.6k
I Don’t Have Time: Getting Over the Fear to Launch Your Podcast
jcasabona
33
2.4k
Speed Design
sergeychernyshev
32
1.1k
Git: the NoSQL Database
bkeepers
PRO
431
66k
Learning to Love Humans: Emotional Interface Design
aarron
273
40k
For a Future-Friendly Web
brad_frost
180
9.9k
Context Engineering - Making Every Token Count
addyosmani
3
43
Balancing Empowerment & Direction
lara
3
620
Transcript
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