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
77
エンジニアリング 💰Moneyジャー / Engineering Money-ger
kenchan
2
690
Lv1,2の開発生産性を経営と繋ぐ
kenchan
4
1.9k
「トップ10プランナー」からはじめる目標設定
kenchan
5
3.9k
負債と言わないことが負債と向き合うこと
kenchan
5
4k
可用性No.1へ!「カラーミーショップ」のリ・アーキテクティング
kenchan
0
130
カラーミーショップは私たちが作っています
kenchan
0
1.6k
カラーミーショップ 2022 / COLORME SHOP 2022
kenchan
0
680
Amazon RDS移行のための 性能検証でわかった2つのこと
kenchan
3
4k
Other Decks in Programming
See All in Programming
地方に住むエンジニアの残酷な現実とキャリア論
ichimichi
5
1.5k
Systèmes distribués, pour le meilleur et pour le pire - BreizhCamp 2025 - Conférence
slecache
0
120
0626 Findy Product Manager LT Night_高田スライド_speaker deck用
mana_takada
0
160
猫と暮らす Google Nest Cam生活🐈 / WebRTC with Google Nest Cam
yutailang0119
0
110
たった 1 枚の PHP ファイルで実装する MCP サーバ / MCP Server with Vanilla PHP
okashoi
1
230
Rubyでやりたい駆動開発 / Ruby driven development
chobishiba
1
660
プロダクト志向なエンジニアがもう一歩先の価値を目指すために意識したこと
nealle
0
130
技術同人誌をMCP Serverにしてみた
74th
1
630
Hack Claude Code with Claude Code
choplin
2
830
なぜ適用するか、移行して理解するClean Architecture 〜構造を超えて設計を継承する〜 / Why Apply, Migrate and Understand Clean Architecture - Inherit Design Beyond Structure
seike460
PRO
3
750
Hypervel - A Coroutine Framework for Laravel Artisans
albertcht
1
110
GitHub Copilot and GitHub Codespaces Hands-on
ymd65536
2
150
Featured
See All Featured
Principles of Awesome APIs and How to Build Them.
keavy
126
17k
The Psychology of Web Performance [Beyond Tellerrand 2023]
tammyeverts
48
2.9k
Done Done
chrislema
184
16k
Fireside Chat
paigeccino
37
3.5k
Helping Users Find Their Own Way: Creating Modern Search Experiences
danielanewman
29
2.7k
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
48
5.4k
How to Ace a Technical Interview
jacobian
277
23k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
eileencodes
138
34k
Bootstrapping a Software Product
garrettdimon
PRO
307
110k
Typedesign – Prime Four
hannesfritz
42
2.7k
Six Lessons from altMBA
skipperchong
28
3.9k
Thoughts on Productivity
jonyablonski
69
4.7k
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