git switch & git restore

Transcript

1. switch & restore ϏΞόογϡ
   
   େฏ௚޺
   !PPIJSB
2. 4VCKFDU
   <"//06/$&>
   (JU
   W
   'SPN
   +VOJP
   $
   )BNBOP
   HJUTUFS!QPCPYDPN
   %BUF
   'SJ
   
   "VH
   
   
    2
   
   5XP
   OFX
   DPNNBOET
   HJU
   TXJUDI
   BOE
   HJU
   SFTUPSF
   BSF
   JOUSPEVDFE
   UP
   
   
   
   TQMJU
   DIFDLJOH
   PVU
   B
   CSBODI
   UP
   XPSL
   PO
   BEWBODJOH
   JUT
   IJTUPSZ
   BOE
   
   
   
   DIFDLJOH
   PVU
   QBUIT
   PVU
   PG
   UIF
   JOEFY
   BOEPS
   B
   USFFJTI
   UP
   XPSL
   PO
   
   
   
   BEWBODJOH
   UIF
   DVSSFOU
   IJTUPSZ
   PVU
   PG
   UIF
   TJOHMF
   HJU
   DIFDLPVU
   
   
   
   DPNNBOE
   
3. • HJU
   TXJUDI
   • ϒϥϯνΛมߋ͢Δૢ࡞
   • HJU
   SFTUPSF
   • ϑΝΠϧΛมߋ͢Δૢ࡞
   ˞
   ·ͩFYQFSJNFOUBMɻHJU
   DIFDLPVU΋࢖͑Δ 3 HJU
   DIFDLPVU
   ͸੹຿͕େ͖͍͔Β෼ׂ
4. • ϒϥϯνͷ੾Γସ͑
   • ϒϥϯνͷ࡞੒ˍ੾Γସ͑
   • ͭલͷϒϥϯνʹ໭Δ 4 HJU
   TXJUDI $ git switch topic # git checkout topic $ git switch -c topic # git checkout -b topic $ git switch - # git checkout -
5. • ϑΝΠϧͷϩʔΧϧͷमਖ਼Λ໭͢
   • ϑΝΠϧΛಛఆͷίϛοτʹ໭͢ 5 HJU
   SFTUPSF
    $ git restore README # git checkout -- README $ git restore --source <commit> README # git checkout <commit> -- README
6. • εςʔδϯάΤϦΞʹ͋ΔϑΝΠϧΛ໭͢
   • εςʔδϯάΤϦΞ΋ϩʔΧϧ΋໭͢ 6 HJU
   SFTUPSF
    $ git restore --staged README # git reset README $ git restore --source HEAD --staged --worktree README # git reset --hard README
7. 7 ઈରDPͷํ͕ଧͪ΍͍͢
   $ vi ~/.gitconfig ... [alias] co = checkout sw = switch
8. • )JHIMJHIUT
   GSPN
   (JU
   
   
   5IF
   (JU)VC
   #MPH
   • IUUQTHJUIVCCMPH IJHIMJHIUTGSPNHJU
   • (JU
   
   HJUTXJUDI
   %PDVNFOUBUJPO
   • IUUQTHJUTDNDPNEPDTHJUTXJUDI
   • (JU
   
   HJUSFTUPSF
   %PDVNFOUBUJPO
   • IUUQTHJUTDNDPNEPDTHJUSFTUPSF 8 ࢀߟจݙ