git switch & git restore

switch & restore ϏΞόογϡେฏ௚޺ !PPIJSB

4VCKFDU<"//06/$&>(JUW 'SPN+VOJP$)BNBOPHJUTUFS!QPCPYDPN %BUF'SJ "VH 2 5XPOFXDPNNBOETHJUTXJUDIBOEHJUSFTUPSFBSFJOUSPEVDFEUP TQMJUDIFDLJOHPVUBCSBODIUPXPSLPOBEWBODJOHJUTIJTUPSZBOE DIFDLJOHPVUQBUITPVUPGUIFJOEFYBOEPSBUSFFJTIUPXPSLPO BEWBODJOHUIFDVSSFOUIJTUPSZPVUPGUIFTJOHMFHJUDIFDLPVU
DPNNBOE

• HJUTXJUDI • ϒϥϯνΛมߋ͢Δૢ࡞ • HJUSFTUPSF • ϑΝΠϧΛมߋ͢Δૢ࡞ ˞·ͩFYQFSJNFOUBMɻHJUDIFDLPVU΋࢖͑Δ 3
HJUDIFDLPVU͸੹຿͕େ͖͍͔Β෼ׂ

• ϒϥϯνͷ੾Γସ͑ • ϒϥϯνͷ࡞੒ˍ੾Γସ͑ • ͭલͷϒϥϯνʹ໭Δ 4 HJUTXJUDI $ git
switch topic # git checkout topic $ git switch -c topic # git checkout -b topic $ git switch - # git checkout -

• ϑΝΠϧͷϩʔΧϧͷमਖ਼Λ໭͢ • ϑΝΠϧΛಛఆͷίϛοτʹ໭͢ 5 HJUSFTUPSF $ git restore
README # git checkout -- README $ git restore --source <commit> README # git checkout <commit> -- README

• εςʔδϯάΤϦΞʹ͋ΔϑΝΠϧΛ໭͢ • εςʔδϯάΤϦΞ΋ϩʔΧϧ΋໭͢ 6 HJUSFTUPSF $ git restore
--staged README # git reset README $ git restore --source HEAD --staged --worktree README # git reset --hard README

7 ઈରDPͷํ͕ଧͪ΍͍͢ $ vi ~/.gitconfig ... [alias] co = checkout
sw = switch

• )JHIMJHIUTGSPN(JU5IF(JU)VC#MPH • IUUQTHJUIVCCMPH IJHIMJHIUTGSPNHJU • (JUHJUTXJUDI%PDVNFOUBUJPO • IUUQTHJUTDNDPNEPDTHJUTXJUDI •
(JUHJUSFTUPSF%PDVNFOUBUJPO • IUUQTHJUTDNDPNEPDTHJUSFTUPSF 8 ࢀߟจݙ

git switch & git restore

git switch & git restore

oohira

More Decks by oohira

Other Decks in Programming

Featured

Transcript

switch & restore ϏΞόογϡେฏ௚޺ !PPIJSB

4VCKFDU<"//06/$&>(JUW 'SPN+VOJP$)BNBOPHJUTUFS!QPCPYDPN %BUF'SJ "VH 2 5XPOFXDPNNBOETHJUTXJUDIBOEHJUSFTUPSFBSFJOUSPEVDFEUP TQMJUDIFDLJOHPVUBCSBODIUPXPSLPOBEWBODJOHJUTIJTUPSZBOE DIFDLJOHPVUQBUITPVUPGUIFJOEFYBOEPSBUSFFJTIUPXPSLPO BEWBODJOHUIFDVSSFOUIJTUPSZPVUPGUIFTJOHMFHJUDIFDLPVU

• HJUTXJUDI • ϒϥϯνΛมߋ͢Δૢ࡞ • HJUSFTUPSF • ϑΝΠϧΛมߋ͢Δૢ࡞ ˞·ͩFYQFSJNFOUBMɻHJUDIFDLPVU΋࢖͑Δ 3

• ϒϥϯνͷ੾Γସ͑ • ϒϥϯνͷ࡞੒ˍ੾Γସ͑ • ͭલͷϒϥϯνʹ໭Δ 4 HJUTXJUDI $ git

• ϑΝΠϧͷϩʔΧϧͷमਖ਼Λ໭͢ • ϑΝΠϧΛಛఆͷίϛοτʹ໭͢ 5 HJUSFTUPSF $ git restore

• εςʔδϯάΤϦΞʹ͋ΔϑΝΠϧΛ໭͢ • εςʔδϯάΤϦΞ΋ϩʔΧϧ΋໭͢ 6 HJUSFTUPSF $ git restore

7 ઈରDPͷํ͕ଧͪ΍͍͢ $ vi ~/.gitconfig ... [alias] co = checkout

• )JHIMJHIUTGSPN(JU5IF(JU)VC#MPH • IUUQTHJUIVCCMPH IJHIMJHIUTGSPNHJU • (JUHJUTXJUDI%PDVNFOUBUJPO • IUUQTHJUTDNDPNEPDTHJUTXJUDI •