計算機科学実験及び演習のための Git / Git for Hardware and Software Laboratory Project

ܭࢉثՊֶ࣮ݧٴͼԋश :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 ͞Βʹৄ͘͠

計算機科学実験及び演習のための Git / Git for Hardware and Software Laboratory Project

計算機科学実験及び演習のための Git / Git for Hardware and Software Laboratory Project

Yusuke Miyazaki

More Decks by Yusuke Miyazaki

Other Decks in Programming

Featured

Transcript

ܭࢉثՊֶ࣮ݧٴͼԋश :VTVLF.JZB[BLJ !૯߹ݚڀ߸ؗ ܭࢉػՊֶ࣮ݧٴͼԋशͷ  ͨΊͷ(JU

͜Μͳ͜ͱ͋Γ·ͤΜ͔ w ʮίʔυΛॻ͍͍ͯͨΒΑ͘Θ͔Βͳ͘ͳͬͨ ͷͰࡢ೔ॻ͍ͨͱ͜Ζ·Ͱ໭Γ͍ͨʯ w ʮͲ͜Λฤूͨ͠ͷ͔෼͔Βͳ͘ͳͬͨʯ w ʮ՝୊Λఏग़ͨ͠λΠϛϯάͷίʔυΛ࢒ͯ͠ ͓͖͍ͨʯ

(JUΛ࢖͏ͱʜ w ࣍ͷΑ͏ͳ͜ͱ͕Ͱ͖·͢ w ػೳΛͭ௥Ճͨ͠௚ޙͷঢ়ଶΛอଘ w ՝୊Λఏग़ͨ͠λΠϛϯάͷঢ়ଶΛอଘ w લճͷঢ়ଶ͔Βฤूͨ͠಺༰ͷࠩ෼ΛӾཡ

(JUͱ͸ w ෼ࢄܕόʔδϣϯ؅ཧγεςϜ 7$4 w -JOVYΧʔωϧͷόʔδϣϯ؅ཧͷͨΊʹ  -JOVT5PSWBMETࢯʹΑͬͯ։ൃ w ݱࡏͷϝϯςφᖛ໺७ࢯ

όʔδϣϯ؅ཧγεςϜ w ϑΝΠϧ ιʔείʔυͳͲ ͷมߋཤྺΛ؅ཧ ͢ΔγεςϜ w ػೳΛ௥Ճ͢Δͨͼʹͦͷঢ়ଶΛอଘͰ͖Δ w όάΛ࢓ࠐΜͰ͠·ͬͨ৔߹͸Ҏલͷঢ়ଶʹ໭

(JUͷΠϝʔδ ίϛοτ  ϑΝΠϧͷมߋ಺༰΍  ϝοηʔδΛؚΉ w ίϛοτ͕༗޲ඇ८ճάϥϑ %"( Λ੒͢ ϒϥϯνɾϚʔδ ཤྺΛ෼ذͯ͠౷߹Ͱ͖Δ

࡞ۀͷྲྀΕ 8PSLJOH ࡞ۀσΟϨΫτϦ 4UBHJOH )JTUPSZ ίϛοτ OFX QBSTFSSLU UFTUSLU

࡞ۀͷྲྀΕ 8PSLJOH ࡞ۀσΟϨΫτϦ 4UBHJOH )JTUPSZ ίϛοτ ίϛοτ͍ͨ͠ϑΝΠϧΛTUBHJOHʹ  HJUBEEpMFpMF OFX

࡞ۀͷྲྀΕ 8PSLJOH ࡞ۀσΟϨΫτϦ 4UBHJOH )JTUPSZ ίϛοτ 4UBHJOHͷ಺༰Λίϛοτ ཤྺʹొ࿥

ϦϙδτϦͷ࡞੒ w όʔδϣϯ؅ཧΛ࢝ΊΔͨΊʹ ཤྺΛ֨ೲ͢Δ (JUϦϙδτϦΛ࡞੒͢Δ w ͸͡ΊʹҰ౓͚ͩߦ͑͹ w ϓϩδΣΫτͷϧʔτσΟϨΫτϦͰ  $

ঢ়ଶͷ֬ೝ w ݱࡏͷ(JUϦϙδτϦͷঢ়ଶΛ֬ೝ͢Δʹ͸  $ git status w 8PSLJOH%JSͰ௥Ճɾมߋ͞Εͨ಺༰΍  4UBHJOHʹ௥Ճ͞Εͨ಺༰͕දࣔ͞ΕΔ w

ίϛοτ w ػೳͷ௥Ճ΍όάͷमਖ਼ͳͲ͖Γͷྑ͍࣌఺Ͱ ίϛοτ͠ঢ়ଶΛอଘ͓ͯ͘͠ w ·ͣ৽͘͠όʔδϣϯ؅ཧԼʹஔ͘ϑΝΠϧ΍ มߋͨ͠ϑΝΠϧΛ4UBHJOHʹ௥Ճ͢Δ  $ git add

ίϛοτ w 4UBHJOHͷ಺༰Λίϛοτͯ͠ཤྺʹొ࿥͢Δ  $ git commit -m "<commit message>" w

ཤྺͷӾཡ w ཤྺΛӾཡ͢Δ$ git log w ίϛοτͷҰཡ͕ϋογϡɾϝοηʔδɾ೔࣌ͳͲ ͱͱ΋ʹදࣔ͞ΕΔ w ͦΕͧΕͷίϛοτ͸ϋογϡ

ཤྺͷӾཡ w ಛఆͷίϛοτͷมߋ಺༰ΛݟΔ  $ git show <commit>

ࠩ෼ͷӾཡ w ࠷ޙͷίϛοτͱ8PSLJOHͷࠩ෼  $ git diff w ࠷ޙͷίϛοτͱ4UBHJOHͷࠩ෼  $ git

࠷ޙͷίϛοτ·Ͱ໭Δ w pMFPSEJSΛ࠷ޙͷίϛοτͷঢ়ଶʹ໭͢  $ git checkout <file or dir>

ίϛοτͷ࡟আ w ͋Δίϛοτ·Ͱ࡟আ͢Δ  8PSLJOH%JS͸ͦͷ··   $ git reset --soft w

• man git / git help <subcommand> w IUUQTHJUTDNDPNEPD w