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
140
計算機科学実験及び演習のための 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
2.6k
Python ウェブアプリケーションのためのプロファイラの実装 // Implementation of a profiler for Python web applications
ymyzk
2
4.6k
CAMPHOR- のスケジュール管理を支える技術 // Schedule Management in CAMPHOR-
ymyzk
1
330
tmux 入門 / Introduction to tmux
ymyzk
0
460
技術カンファレンスのススメ / Tech Conference
ymyzk
0
280
Proper Tail Calls - New Feature in ECMAScript 2015
ymyzk
1
300
Modern JavaScript - Introduction to ECMAScript 2015 & 2016
ymyzk
0
180
コンテナ型仮想化入門 / Introduction to container-based virtualization
ymyzk
0
220
漸進的型付けについて語る会 オープニング / Gradual Typing Opening
ymyzk
0
350
Other Decks in Programming
See All in Programming
CakePHPの内部実装 から理解するPSR-7
boro1234
0
150
I/O Extended 2022 in Android ~ Whats new in Android development tools
pluu
0
550
JetPackComposeは宣言型プログラミングパラダイムって実はよくわかってないんですが、別に使ってもいいんですよね、
conigashima
0
180
GitHub Actions を導入した経緯
tamago3keran
1
430
Client-Side Field-Level Encryption for Apache Kafka Connect @ VoxxedDays Luxembourg 2022
hpgrahsl
0
110
From Java through Scala to Clojure
lagenorhynque
0
210
インターン生・新卒向け、学校でもっと教えてほしいITエンジニア基本スキル
nearme_tech
0
120
言語処理ライブラリ開発における失敗談 / NLPHacks
taishii
1
440
How we run a Realtime Puzzle Fighting Game on AWS Serverless
falken
0
250
GitHubのユーザー名を変更した後のあれこれ
tahia910
0
130
ES2022の新機能
smt7174
0
240
Modern Android Developer ~ 안내서
pluu
1
620
Featured
See All Featured
JavaScript: Past, Present, and Future - NDC Porto 2020
reverentgeek
37
3.3k
Art Directing for the Web. Five minutes with CSS Template Areas
malarkey
196
9.4k
How GitHub (no longer) Works
holman
296
140k
Raft: Consensus for Rubyists
vanstee
126
5.4k
Web Components: a chance to create the future
zenorocha
303
40k
Visualization
eitanlees
124
11k
The Invisible Side of Design
smashingmag
290
48k
The Cult of Friendly URLs
andyhume
68
4.8k
How STYLIGHT went responsive
nonsquared
85
3.9k
How to train your dragon (web standard)
notwaldorf
58
3.9k
Why You Should Never Use an ORM
jnunemaker
PRO
47
7.6k
Robots, Beer and Maslow
schacon
152
7.1k
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 ͞Βʹৄ͘͠