Upgrade to Pro
— share decks privately, control downloads, hide ads and more …
Speaker Deck
Speaker Deck
PRO
Sign in
Sign up for free
計算機科学実験及び演習のための Git / Git for Hardware and Software Laboratory Project
Yusuke Miyazaki
April 14, 2016
Programming
0
170
計算機科学実験及び演習のための Git / Git for Hardware and Software Laboratory Project
Yusuke Miyazaki
April 14, 2016
Tweet
Share
More Decks by Yusuke Miyazaki
See All by Yusuke Miyazaki
Adopting Kafka for the #1 job site in the world
ymyzk
1
5.9k
Python ウェブアプリケーションのためのプロファイラの実装 // Implementation of a profiler for Python web applications
ymyzk
2
4.7k
CAMPHOR- のスケジュール管理を支える技術 // Schedule Management in CAMPHOR-
ymyzk
1
380
tmux 入門 / Introduction to tmux
ymyzk
0
520
技術カンファレンスのススメ / Tech Conference
ymyzk
0
310
Proper Tail Calls - New Feature in ECMAScript 2015
ymyzk
1
310
Modern JavaScript - Introduction to ECMAScript 2015 & 2016
ymyzk
0
200
コンテナ型仮想化入門 / Introduction to container-based virtualization
ymyzk
0
240
漸進的型付けについて語る会 オープニング / Gradual Typing Opening
ymyzk
0
390
Other Decks in Programming
See All in Programming
tidy_rpart
bk_18
0
590
Showkase、Paparazziを用いたビジュアルリグレッションテストの導入にチャレンジした話 / MoT TechTalk #15
mot_techtalk
0
110
Writing Greener Java Applications
hollycummins
0
340
Becoming an Android Librarian (Android World Wide 2023 Jan)
skydoves
1
200
OIDC仕様に準拠した Makuake ID連携基盤構築の裏側
ymtdzzz
0
540
WordPress(再)入門 - 基礎知識・環境編
oleindesign
1
130
What's new in Shopware 6.5
shyim
0
110
Step Functions Distributed Map を使ってみた
codemountains
0
100
ECS Service Connectでマイクロサービスを繋いでみた
xblood
0
540
PHPDocにおける配列の型定義を少し知る
shimabox
1
130
Hasura の Relationship と権限管理
karszawa
0
170
和暦を正しく扱うための暦の話
nagise
10
6.2k
Featured
See All Featured
Unsuck your backbone
ammeep
659
56k
Raft: Consensus for Rubyists
vanstee
130
5.7k
Design and Strategy: How to Deal with People Who Don’t "Get" Design
morganepeng
109
16k
Keith and Marios Guide to Fast Websites
keithpitt
407
21k
Web development in the modern age
philhawksworth
197
9.6k
The Straight Up "How To Draw Better" Workshop
denniskardys
226
130k
Practical Orchestrator
shlominoach
178
8.9k
Agile that works and the tools we love
rasmusluckow
320
20k
"I'm Feeling Lucky" - Building Great Search Experiences for Today's Users (#IAC19)
danielanewman
217
21k
Typedesign – Prime Four
hannesfritz
34
1.5k
The Invisible Customer
myddelton
113
12k
CSS Pre-Processors: Stylus, Less & Sass
bermonpainter
349
27k
Transcript
ܭࢉثՊֶ࣮ݧٴͼԋश :VTVLF.JZB[BLJ !૯߹ݚڀ߸ؗ ܭࢉػՊֶ࣮ݧٴͼԋशͷ ͨΊͷ(JU
͜Μͳ͜ͱ͋Γ·ͤΜ͔ w ʮίʔυΛॻ͍͍ͯͨΒΑ͘Θ͔Βͳ͘ͳͬͨ ͷͰࡢॻ͍ͨͱ͜Ζ·ͰΓ͍ͨʯ w ʮͲ͜Λฤूͨ͠ͷ͔͔Βͳ͘ͳͬͨʯ w ʮ՝Λఏग़ͨ͠λΠϛϯάͷίʔυΛͯ͠ ͓͖͍ͨʯ
(JUΛ͏ͱʜ w ࣍ͷΑ͏ͳ͜ͱ͕Ͱ͖·͢ w ػೳΛͭՃͨ͠ޙͷঢ়ଶΛอଘ w ՝Λఏग़ͨ͠λΠϛϯάͷঢ়ଶΛอଘ w લճͷঢ়ଶ͔Βฤूͨ͠༰ͷࠩΛӾཡ
(JUͱ w ࢄܕόʔδϣϯཧγεςϜ 7$4 w -JOVYΧʔωϧͷόʔδϣϯཧͷͨΊʹ -JOVT5PSWBMETࢯʹΑͬͯ։ൃ w ݱࡏͷϝϯςφᖛ७ࢯ
όʔδϣϯཧγεςϜ w ϑΝΠϧ ιʔείʔυͳͲ ͷมߋཤྺΛཧ ͢ΔγεςϜ w ػೳΛՃ͢Δͨͼʹͦͷঢ়ଶΛอଘͰ͖Δ w όάΛࠐΜͰ͠·ͬͨ߹Ҏલͷঢ়ଶʹ
Δ͜ͱ͕Ͱ͖Δ w ͋ΔఔͷنͷιϑτΣΞͰ΄΅ඞਢ
(JUͷΠϝʔδ ίϛοτ ϑΝΠϧͷมߋ༰ ϝοηʔδΛؚΉ w ίϛοτ͕༗ඇ८ճάϥϑ %"( Λ͢ ϒϥϯνɾϚʔδ ཤྺΛذͯ͠౷߹Ͱ͖Δ
ࠓճઆ໌͠ͳ͍
࡞ۀͷྲྀΕ 8PSLJOH ࡞ۀσΟϨΫτϦ 4UBHJOH )JTUPSZ ίϛοτ OFX QBSTFSSLU UFTUSLU
NPEJpFE TZOUBYSLU 8PSLJOH%JSFDUPSZʹϑΝΠϧΛՃɾฤू
࡞ۀͷྲྀΕ 8PSLJOH ࡞ۀσΟϨΫτϦ 4UBHJOH )JTUPSZ ίϛοτ ίϛοτ͍ͨ͠ϑΝΠϧΛTUBHJOHʹ HJUBEEpMFpMF OFX
QBSTFSSLU UFTUSLU NPEJpFE TZOUBYSLU OFX QBSTFSSLU NPEJpFE TZOUBYSLU
࡞ۀͷྲྀΕ 8PSLJOH ࡞ۀσΟϨΫτϦ 4UBHJOH )JTUPSZ ίϛοτ 4UBHJOHͷ༰Λίϛοτ ཤྺʹొ
HJUDPNNJUNNFTTBHF OFX QBSTFSSLU UFTUSLU NPEJpFE TZOUBYSLU OFX QBSTFSSLU NPEJpFE TZOUBYSLU NFTTBHF IBTI OFX QBSTFSSLU NPEJpFE TZOUBYSLU
ϦϙδτϦͷ࡞ w όʔδϣϯཧΛ࢝ΊΔͨΊʹ ཤྺΛ֨ೲ͢Δ (JUϦϙδτϦΛ࡞͢Δ w ͡ΊʹҰ͚ͩߦ͑ w ϓϩδΣΫτͷϧʔτσΟϨΫτϦͰ $
git init
ঢ়ଶͷ֬ೝ w ݱࡏͷ(JUϦϙδτϦͷঢ়ଶΛ֬ೝ͢Δʹ $ git status w 8PSLJOH%JSͰՃɾมߋ͞Εͨ༰ 4UBHJOHʹՃ͞Εͨ༰͕දࣔ͞ΕΔ w
ঢ়گ͕Α͘Θ͔Βͳ͘ͳͬͨΒͱΓ͋͑ͣ TUBUVTΛݟΔบΛ͚ͭ·͠ΐ͏
ίϛοτ w ػೳͷՃόάͷमਖ਼ͳͲ͖Γͷྑ͍࣌Ͱ ίϛοτ͠ঢ়ଶΛอଘ͓ͯ͘͠ w ·ͣ৽͘͠όʔδϣϯཧԼʹஔ͘ϑΝΠϧ มߋͨ͠ϑΝΠϧΛ4UBHJOHʹՃ͢Δ $ git add
<file1> <file2> …
ίϛοτ w 4UBHJOHͷ༰Λίϛοτͯ͠ཤྺʹొ͢Δ $ git commit -m "<commit message>" w
ίϛοτ࣌ʹϝοηʔδΛՃ͢Δ w มߋ༰Λॻ͍͓ͯ͘ͱޙͰ͔Γ͍͢ w ྫύʔαʔΛ࣮ w ྫҙຯղੳͰʙʙʙʹͳΔόάΛमਖ਼
ཤྺͷӾཡ w ཤྺΛӾཡ͢Δ$ git log w ίϛοτͷҰཡ͕ϋογϡɾϝοηʔδɾ࣌ͳͲ ͱͱʹදࣔ͞ΕΔ w ͦΕͧΕͷίϛοτϋογϡ
4)" Ͱ ҰҙʹಛఆͰ͖Δ ྫ5a00b5712a039bfea1e8055206ab697e3081247d w ΦϓγϣϯΛՃ͢Δͱͬͱ৭ʑݟΕΔ
ཤྺͷӾཡ w ಛఆͷίϛοτͷมߋ༰ΛݟΔ $ git show <commit>
ࠩͷӾཡ w ࠷ޙͷίϛοτͱ8PSLJOHͷࠩ $ git diff w ࠷ޙͷίϛοτͱ4UBHJOHͷࠩ $ git
diff --cached w ͋Δίϛοτ"ͱ͋Δίϛοτ#ͷࠩ $ git diff <commit A>...<commit B>
࠷ޙͷίϛοτ·ͰΔ w pMFPSEJSΛ࠷ޙͷίϛοτͷঢ়ଶʹ͢ $ git checkout <file or dir>
ίϛοτͷআ w ͋Δίϛοτ·Ͱআ͢Δ 8PSLJOH%JSͦͷ·· $ git reset --soft w
͋Δίϛοτ·Ͱআ͢Δ 8PSLJOH%JSॻ͖͑Δ $ git reset --hard
• man git / git help <subcommand> w IUUQTHJUTDNDPNEPD w
IUUQTUSBJOJOHHJUIVCDPNSFTPVSDFT ͞Βʹৄ͘͠