ãšã€ããŒã ã©ã€ãã¹ã¿ã€ã«ã¢ããã³ãã«ã¬ã³ããŒ2017ã13æ¥ç®ã§æãè¿ãå°ç¹ã«ããŸããïŒ
仿¥ã¯æ ªåŒäŒç€Ÿãšã€ããŒã ã©ã€ãã¹ã¿ã€ã«ã®ãã¶ã€ããŒ@gilly ãæ
åœããŸãã
ãããããé¡ãããŸãm(_ _)m
3幎åã®ç§ã¯Gitææçã§ãã
ç§ã¯Gitã䜿ãå§ããŠ4幎ç®ã®ãã¶ã€ããŒã§ãã
æ®æ®µã¯ããžã¥ã¢ã«ããã³ãŒãã£ã³ã°ãŸã§æ
åœããŠããŸãã
Gitãã¯ãããŠç¥ã£ãã®ã¯åè·ã§ãã
åè·ã§ã¯äŒç€Ÿçã«ãGitå°å
¥é»ææã ã£ãããããšã³ãžãã¢ããã¶ã€ããŒããäºãææ¢ãã§ã¯ãããŸããã
ããããªããšããããã£ãŠããšã³ãžãã¢ã«è³ªåããŠã¿ããšããšããããã°ã°ã£ãŠã¿ãªããšèšãããããšãâŠã
æ¥åã®çæéã«æããŠãããæ©çŸ©ã¯æãã€ã€ããããã£ãããã®ãšã³ãžãã¢ã¢ããªãããšå
å¿æã£ããã®ã§ãã
===
ãšã€ããŒã ã«è»¢è·ããŠã¿ããšããã¶ã€ããŒã«Gitã®äœ¿ãæ¹ãå ±æããæ©äŒãå€ãã£ããããããã¶ã€ããŒãã€ãŸã¥ãããããã€ã³ããæŒãããŠãããŠããŸããã
ãããã£ãè¯ãã£ããªãšæããšãããšãç§ã®çµéšããŸãšããŠããã¶ã€ããŒãšããŠã¯ãããªGitã®æãæ¹ãããŠããããšå¬ããããšãææ¡ãããŠããã ããããšæããŸãã
ç¹ã«ãããããã¶ã€ããŒã«åããŠGitãæããæ©äŒããããšã³ãžãã¢ã¯ããã®ãšã³ããªãŒãå®è·µããŠããããããã£ãšãã¶ã€ããŒããã¢ãããšæããŸãã
詊ãã«ããã®èšäºã®å 容ããšã³ãžãã¢ãå®è·µããŠããããã©ãæãïŒããšç€Ÿå ã¢ã³ã±ãŒããåããŸããã
| é ç® | å²å |
|---|---|
| ãã²ä»ãåããã | 40% |
| ä»ãåã£ãŠããã | 30% |
| ãåéãã | 28% |
| ã ãæãïŒ | 2% |
ãããã§ãããïŒ
ãã®éãããã¶ã€ããŒããã¢ãã¢ãã§ãïŒ
â çé¢ç®ãªè©±âŠ
ã¿ã€ãã«ã¯ãµãããŠããŸãããçé¢ç®ãªè©±ããããš4幎åã®ç§ããããªæãæ¹ãããŠããããŠããããæ¬åœã«Gitã«æ¯ããããšããªãã£ããšæããŸãã
ãªãããã®ããçè§£ãã§ããªãã£ãã®ãã
ãã®æã©ãããŠããããŠãããããšã³ãžãã¢ããã¶ã€ããŒããäºã幞ãã«ãªããã®ãã
Gitã䜿ãå§ããæã«ãã¶ã€ããŒãšããŠç¥ãããã£ãããšãç¥ããªããŠãå°ããªãã£ãããšãäžçæžåœãŸãšããŸããã
æ ç±ã蟌ããããããã§ã1äžåãè¶ ãããšã³ããªãŒã«ãªã£ãŠããŸã£ãŠããŸãã
é çªãæèããã®ã§ãäžããé ã«èªã¿é²ããŠããã ãããšãããããã§ãã
â ãããã
- ããã®1ããå³è§£ããæŽ»çšãããç°¡åãã£ãŠåãã€ããªããšã³ãžãã¢ã¯ã¢ãã
- ããã®2ãGitã§å¹žãã«ãªãäžçãå ±æããŠããããšã³ãžãã¢ã¯çŽ æµã
- ããã®3ãç°å¢æ§ç¯ããµããŒãããŠããããšã³ãžãã¢ã¯ãã®ãããé Œããã
- ããã®4ããããæ¬çªããã¶ã€ããŒã«æåã«æããŠæ¬²ããGitã®ã³ãã³ã
- ããã®5ãGitã䜿ãã ããæã®ãµããŒããå¿ãããªããšã³ãžãã¢ã«ãã¥ã³ãšãã
ããã®1ããå³è§£ããæŽ»çšãããç°¡åãã£ãŠåãã€ããªããšã³ãžãã¢ã¯ã¢ãã
çŽæ¥ãã¶ã€ããŒã«Gitã®è©±ããã«ããåãããGitãæããæºåã¯å§ãŸããŸãã
ãŸãã¯ããã¶ã€ããŒãšããäººçš®ã«æãããšãã®ãå¿æ§ãããæºåããŸãããã
ä»åã¯2ç¹ã玹ä»ããŸãã
â ãã¶ã€ããŒã¯ããã¹ããããå³è§£ã®æ¹ãåŸæ
ããããªç»åãçšæããå¿
èŠã¯ãããŸããã
è©±ã®æµãã§ãã¯ã€ãããŒããã³ããŒçšçŽã«æ®Žãæžãããã ãã§ãOKã§ãã
ãã¶ã€ããŒã¯ãããã¹ããããå³ãèªèããåãé·ããŠãã人ãå€ãã§ããïŒâ»å人差ã¯ãããŸãïŒ
説æãããšãã¯ãããã¹ãã ãã§ãªãå³è§£ããããšãããªãã»ã©ïŒããšãªãç¬éãå€ããªããŸãã
éã«ãã¶ã€ããŒãã質åããŠããããšãããå³è§£ããããã«ãªã¯ãšã¹ããããŠãã ããã
ãªããªãããã¶ã€ããŒã®äžã«ã¯æ²¹æããããšå€§éªã®ãã°ã¡ããã¿ããã«
ããããããïœã£ãŠãªã£ãŠããããªããããã®ã¥ããŠãªããã§ãã
ãšããå
·åã«å€åœ©ãªæ¬é³ã§èªåã®æèŠãå
±æããããšããã¿ã€ããããŸãã
ããããã¿ã€ãããå³è§£ããŠãããã°ãæããããªãã
ããã®ãã©ã³ãããããããã¬ãŒããšé²ãã§âŠã
ãšè©±ããŠããŠããåãå³ãèŠãŠãããšã³ãžãã¢ã®ããªãã¯æå³ãæ±²ã¿åãäŒè©±ãé²ãããããªãæããŸãã
å³è§£ã§èšèãè£ããªããé²ããŸãããã
â ãšã³ãžãã¢ã«ãšã£ãŠã®ãç°¡åãã¯ããã¶ã€ããŒã«ãšã£ãŠã¯åã«èããã
ãšã³ãžãã¢ã«ãšã£ãŠã¯æ¬åœã«ç°¡åãªããšã§ãããã¶ã€ããŒã«ãšã£ãŠã¯ç°¡åã§ãªãããšãããããŸããã
ãããªããšããåã€ãïŒãç°¡åã£ãŠèšã£ããããªãããšãã¶ã€ããŒã¯è£åãããæ°æã¡ã«ãªã£ãŠããŸããŸãã
äŸãã°ããããªããã¶ã€ããŒããçŽãšéçãæž¡ãããŠã
ãéšé·ã®äŒŒé¡çµµãç²Ÿå¯æåã§æããŠã¿ãŠãã ãã(ã»âã»)ã
ã£ãŠèšãããããããŒãã«ãé«ãæããŸãããïŒ
ãŸããŠããã¶ã€ããŒã
ãéå
·ã¯æž¡ããããèŠããŸãŸæžãã°ãããã§ããã»ããç°¡åã§ããïŒ(ã»âã»)ã
ãªããŠèšãåºãããã
ãåã ããäœèšã£ãŠãã ããã€(# ïŸÐïŸ)ã
ãšæã£ãŠãéçã眮ããããªããŸãããã
çžæã®ç«å Žã«ãã£ãæã«ããã»ããç°¡åã§ããïŒããšããäžèšã®æ®é ·ãã宿ããŠããã ãããšæããŸãã
â 倧äºãªã®ã¯çžæã®ç«å Žã«ç«ã£ãŠè¡åããããš
ãå³è§£ãããç°¡åãšèšããªããããšããçžæãæ°é£ãæ°æã¡ã倧äºã§ãã
çžæã®ç«å Žã«ãã£ãŠè¡åã§ããããšãããã¢ããã€ã³ãã§ã¯ç¡ãã§ããããã
ããã®2ãGitã§å¹žããªäžçãå ±æãã
ããããã¯çŽæ¥ãã¶ã€ããŒãšã³ãã¥ãã±ãŒã·ã§ã³ãåã£ãŠãããŸãã
ãŸãã¯ãGitãå°å
¥ããããšã§ã©ããªå¹žããªäžçã«ãªãã®ããå
±æããŸãã
ãã»ãã䜿ããããªã£ãŠããã§ãããïŒããšã¢ãããŒã·ã§ã³ãäžãããšããããå§ããŸãããã
â Gitã§å¹žãã«ãªãäžç
-
ä»ã®äœæ¥è ãšãã¶ã£ãŠããããæãã«äžã€ã«ãŸãšããŠããã

-
éå»ã®ãã¡ã€ã«ãšã®å€æŽç¹ãèŠåãããã
- éå»ã®ãã¡ã€ã«ããã£ãŠæ¥ããã
â Gitã ãã§ã¯ã§ããªãããš
Gitã§ãããè¯ãäžçãã§ãããããªãããšæã£ãã®ã§ãããã²ãšã€å€§ããªåéããããŠããããšããããŸãã
ããã¯PhotoshopãIllustratorã®ç»åãGitã§ç®¡çã§ãããšæã£ãããšã§ãã
æŸä»»äž»çŸ©ã®ãšã³ãžãã¢ã«æããããç§ã¯ãIllustratorã®ããŒã¿ããªããžããªã«çªã£èŸŒãã§ããŸããŸããã
åŸãããéããããããªããžããªã«çœ®ããªãã§ããšãšã³ãžãã¢ã«æ³šæãããŠããGitã£ãŠé£ããâŠ(ÂŽã»Ïã»ïœ)ããšæã£ãåºæ¥äºã§ããã
ãŸããjpgãpngãšéããããã®ãã¡ã€ã«ã¯ã倿Žã®å·®åãGitHubãªã©ã§ã¯ãã¬ãã¥ãŒã§ããªãããšãåŸã§ç¥ããŸããã
ã©ãã§äœã管çãããã®ããŒãžã§ã³ç®¡çãã§ããç¯å²ãæŽçããããšã¯å€§äºã§ããã
æè¿ã¯ãã¶ã€ã³ã®ããŒãžã§ã³ç®¡çããŒã«ãšããŠãAbstractããªã©ããããŸãã
äžã€ã®ããŒã«ã§ãã¹ãŠå¯Ÿå¿ã§ãããã ãšæãããªããããæåŸ å€ã調æŽããããšããäºã幞ãã«ãªãäžæ©ã ãšç§ã¯æããŸãã
ããã®3ãç°å¢æ§ç¯ããµããŒãããŠããããšã³ãžãã¢ã¯ãã®ãããé Œããã
ç°å¢èšå®ã¯2ã€ã«åããŠè©±ããããšæããŸãã
- ãšã³ãžãã¢ããµã¯ãµã¯é²ããŠããããšãã
- CUIããŒã«ããGUIããŒã«ã
â ãšã³ãžãã¢ããµã¯ãµã¯é²ããŠããããšãã
æåã®ç°å¢èšå®ã¯ããšã³ãžãã¢ããµã¯ãµã¯ã£ãšé²ããŠããŸã£ãŠè¯ããšæããŸãã
èå³ããã人ã«ã¯ããã¡ãã説æããŠãããŠãã®ãè¯ãã§ãã
çåã«å¯Ÿããäžå¯§ã«ä»ãåã£ãŠããããšã³ãžãã¢ã®å¥œæåºŠãããããŸãã
ãã ãGitãç¥ã£ãã°ããã®ãã¶ã€ããŒçžæã ãšããªããžããªãšã®é¢ä¿æ§ãGitã³ãã³ãã¯ãéæ³ã®åªæãã§ãããããŸããã
ãã®ãããšã³ãžãã¢ãªã30åã§çµããèšå®ãã3æéãããããšãããã§ãããã
ããã§ã®èª¬æã¯çްããããšãããããã£ãããšããããšã ãã«çããããšãããããããŸãã
詳现ãªèª¬æã¯ãåŸè¿°ãããâ 1ã¶æåŸã«ã¯æ¯ãè¿ããè¡ããããŸã§ãšã£ãŠãããŸãããã
ãã£ãããšãã説æã«äœ¿ããå³ãããã®4ãã§ç޹ä»ããŸãã®ã§ãåèã«ããŠãã ããã
ãšã³ãžãã¢ããµã¯ãµã¯é²ããŠããããã®ãªã¹ãã¢ãã
- CUIããŒã«ã®éžå®
- Gitã®ã€ã³ã¹ããŒã«
- ããŒã«ã«ã®ãªããžããªäœæ
- éµã®èšå®
- èªç€Ÿã®ãªããžããªã®ã¯ããŒã³
ç°å¢èšå®ããŸã
äžèšã®é
ç®ãå¯èœã§ãããèšå®ããŠãããããšå©ãããŸãïŒ
å®éãäœæ¥å¹çã¢ããã«ç¹ãã£ãŠãããšæããŠãããŸãã
- aliasã®èšå®
- åŒç€Ÿã§ã¯ãã®èšå®ãæ¡çšããŠããŸãã.gitconfigã«èšå®ããŠãaliasãªã©ã®ãŸãšã - ( êªâêª) ããããæ¥èšã
- ç¹ã«å³è§£ã§çè§£ããã¿ã€ãã®ãã¶ã€ããŒã«ã¯ãã¯ãŒãã³ã°ããªãŒãç°¡åã«è¡šç€ºãããaliasã¯éå®ããããŸãã
- tabã§ã®è£å®èšå®
- ãã¡ã€ã«ã®pathã®è£å®
- branchåã®è£å®
â CUIããŒã«ããGUIããŒã«ã
ãã¶ã€ããŒã«GitãæäœããŠãããããŒã«ã®éžå®ã¯é£ãããšããã ãšæããŸãã
å人çã«ã¯ããŸãã¯CUIããŒã«ã§ã®æäœã«ææŠãããŠã¿ãããšããªã¹ã¹ã¡ãããã§ãã
ãªãããæãã®ãé çªã«èª¬æããŸããã
CUIããŒã«ã¯ãšã³ãžãã¢ã®ãµããŒããåãããã
CUIããŒã«ã®æå€§ã®ã¡ãªããã¯ãã©ãã«ã®æã«ãšã³ãžãã¢ããã©ããŒã«åããããç¹ã ãšæããŸãã
ãŸããæåã®åŠç¿ã³ã¹ãã¯é«ãã§ããã䜿ããããã«ãªã£ãããã¶ã€ããŒã®ã§ããããã³ãåšãã®æ¥åãå¢ããŸããã
äžèšã¯ãç§ãæãCUIããŒã«ããã¶ã€ããŒã䜿ã£ãæã®ã¡ãªãããšãã¡ãªããã§ãã
âCUIããŒã«ã®ã¡ãªãããšãã¡ãªãã
ã¡ãªãã
- ãã©ãã«ã®æã«ãšã³ãžãã¢ããã©ããŒã«åãããã
- ãã¶ã€ããŒãGitã³ãã³ããèŠãã
- ä»ã®ãããžã§ã¯ãã«ç§»åããŠããç°å¢ãäœãããã
- ããã³ããšã³ãã§äœ¿ãã¿ã¹ã¯ã©ã³ããŒãªã©ãèªåã§åã蟌ããããã«ãªã
ãã¡ãªãã
- é»ãç»é¢ãæãããã¶ã€ããŒãå€ã
ãããã®éãããã¡ãªããã¯ãé»ãç»é¢ãæãããããšã ãã ãšæããŸãã
ãããŠãã®ãã¡ãªããã¯ãæåã®æãæ¹ããæŒãããŠããã°ããã«åãé€ããŸãã
ãã¶ã€ããŒã®é»ãç»é¢ã®æãã¯åãé€ããïŒ
ãã¶ã€ããŒãé»ãç»é¢ãæããäžçªã®çç±ã¯äœãæžããŠããã®ãããããªãããšã ãšæããŸãã
ãªã®ã§ãã©ããªã³ãã³ããæãŠã°ãäœãè¿ã£ãŠããã®ããæåã«æããã ãã§ãæãã¯ç°¡åã«åãé€ããã®ã§ã¯ãªãã§ããããã
äŸãã°ããããªæé ã§ãã¶ã€ããŒã«æããŠããã£ãããæå€ãšæ©ãCUIããŒã«ãåãå ¥ããŠãããããã«ãªããŸãã
1)æåã«æããé»ãç»é¢ã®ã³ãã³ã
ãŸãã¯ãäžèšã®3ã€ã®ã³ãã³ããšããã®æãªã«ãèµ·ããããå
±æããã ãã§åé¡ãããŸããã
ããããç¥ã£ãŠããã ãã§ããç¿åŸé床ãæç¶æ©ããªããŸãã
| ã³ãã³ã | 説æ |
|---|---|
| cd | ãã£ã¬ã¯ããªïŒãã©ã«ãïŒãç§»åããããã®ã³ãã³ã |
| pwd | çŸåšã®ãã£ã¬ã¯ããªïŒãã©ã«ãïŒã確èªããããã®ã³ãã³ã |
| ls | çŸåšã®ãã£ã¬ã¯ããªïŒãã©ã«ãïŒã®ãã¡ã€ã«ããã£ã¬ã¯ããªã確èªããããã®ã³ãã³ã |
2)å®éã«æäœãäœéšãããŠã¿ã
ããã®3ãã§æ¢ã«Gitã®ç°å¢ã¯æ§ç¯ã§ããŠãããšæããŸãã
ãŸãã¯ãããŒã«ã«ãªããžããªã«ãã©ãçããšãããç®æšã«ãäžç·ã«rootããç§»åããŠã¿ãŸãããã
äžåºŠæåäœéšãæãŠã°èªä¿¡ãã€ããã®ã§ãïŒ(à¹â¢Ìã
â¢Ìà¹)â§
èªèº«ãæãŠãã°ãããé»ãç»é¢ãªããŠæããããŸããã
GUIããŒã«ã¯UIããããããã
CUIããŒã«ã®å ææ¹æ³ãææ¡ãããŠããã ããŸããããããã§ã䜿ãã«ãããã«ããŠãããGUIããŒã«ã®å°å ¥ãæ€èšããŠã¿ãŠãã ããã
äŸãã°ããSourcetreeãã¯æåãªããŒã«ã§ãUIãããããããã§ãã
https://ja.atlassian.com/software/sourcetree

GitHubã§ç®¡çããŠãããªããGitHubã®ãã¹ã¯ãããããŒã«ãã·ã³ãã«ã§è¯ãããã§ãã
https://desktop.github.com/

ä»ã«ãGitã®å
¬åŒã§ç޹ä»ããŠããããŒã«ããããŸãã®ã§ãããŒã ã«åããããªãã®ãèŠç¹ã£ãŠã¿ãŠãã ããã
https://git-scm.com/downloads/guis
âGUIããŒã«ã®ã¡ãªãããšãã¡ãªãã
ã¡ãªãã
- çŽæã§æäœã§ããUI
- ãã䜿ãã³ãã³ãã¯ã¢ã€ã³ã³ã§ç®ã«ã€ãæã«é 眮ãããŠãã
- ã¯ãŒãã³ã°ããªãŒãèŠããã
- diffã®ãã€ã©ã€ããèŠããã
- ç»åã®diffã䞊ã¹ãŠèŠãããšãã§ãã
- ãã¶ã€ããŒãžã®æè²ã³ã¹ããæžãããããããšã³ãžãã¢ã¯æ¥œã«ãªããïŒããïŒ
ãã¡ãªãã
- ãã©ãã«ã®æã«ãšã³ãžãã¢ããã©ããŒã«åãã«ãã
- Gitã³ãã³ããèŠããªã
- GUIãå°å ¥ããããã«ããšã³ãžãã¢ãšãã¶ã€ããŒã®ç°å¢ãç°ãªãå Žåããã
CUIããŒã«ãGUIããŒã«ãè¿·ã£ããšãã¯
ãã¶ã€ããŒã®æ åœããç¯å²ãšããã®ãã¶ã€ããŒã®ãã£ãªã¢ãã¹ãã倿ããŠã¯ãããã§ãããã
1)CUIããŒã«ãããããããã¿ã€ã
ããžã¥ã¢ã«ããããã³ããŸããã®ã³ãŒãã£ã³ã°ãŸã§å¯Ÿå¿ããã¿ã€ãã®ãã¶ã€ããŒã«ã¯CUIããŒã«ã䜿ããã»ããã¡ãªãããå€ããšæããŸãã
æåã®åŠç¿ã³ã¹ãã¯é«ãã§ããã䜿ãããªããæ§ã«ãªã£ãæã«ãšã³ãžãã¢ããã©ããŒããã³ã¹ããæ Œæ®µã«æžããŸãã
äŸãã°ãèªåã§äœã£ãããŒãžãªã¯ãšã¹ããã¬ãã¥ãŒåŸã«èªåã§ããŒãžã§ããŸãã
ãã®æã³ã³ããªã¯ããèµ·ãããŠããããã«èªåã§å¯Ÿå¿ã§ããã®ã§ãã³ãã¥ãã±ãŒã·ã§ã³ã³ã¹ãããããã«å€æã§ããŸãã
ãŸããã³ãã³ããèŠããã®ã§ããšã³ãžãã¢ãäœã£ãrakeã¿ã¹ã¯ãã¹ã¯ãªãããå®è¡ããããšã«æµææããããŸããã
ãã¶ã€ããŒèªèº«ã®ãã£ãªã¢ãã¹ãšããŠãããã³ããšã³ããšã³ãžãã¢ã®é åã§ã§ããããšãæ Œæ®µã«å¢ããã®ã§ãã¢ãããŒã·ã§ã³ãæã£ãŠåŠç¿ã§ãããšæããŸãã
ãªã®ã§ãã³ãŒãã£ã³ã°ãŸã§å¯Ÿå¿ãããã¶ã€ããŒã®å Žåã¯CUIããŒã«ããªã¹ã¹ã¡ããŸãã
2)GUIããŒã«ãããããããã¿ã€ã
ããŒã±ãã£ã³ã°é åãUXèšèšãåŸæã§ãããžã¥ã¢ã«äœæãŸã§ãæ åœããããšãå€ãã¿ã€ãã®ãã¶ã€ããŒã«ã¯GUIããŒã«ããªã¹ã¹ã¡ããŸãã
ãã®ã¿ã€ãã¯ãã³ãŒãã£ã³ã°ããæ©äŒãå°ãªãã§ãã
ãŸããèªåã®ã³ããããããŒãžããæ©äŒãå°ãªããããã³ã³ããªã¯ããªã©ã®ãã©ãã«ã¯ãšã³ãžãã¢ã察å¿ããããšãå€ããªããŸãã
ãã¶ã€ããŒã¯æ°ã¥ããªããã¡ã«ã¯ãŒãã³ã°ããªãŒã䌞ã³ãŠããããšã«ãªããŸãã
æåã®åŠç¿ã³ã¹ãã®å°ãªãGUIããŒã«ã䜿ã£ãæ¹ããæµææããªãGitã䜿ã£ãŠãããããã«ãªãã®ã§ã¯ãªãã§ããããã
ããã®4ããããæ¬çªããã¶ã€ããŒã«æåã«æããŠæ¬²ããGitã®ã³ãã³ã
ãããŸã§ã¯ãGitã䜿ãå§ãããŸã§ã®è©±ã§ããã
ããããã¯ãå®éã«Gitã䜿ãå§ãããšãã®è©±ãããŸãããã
æ¬é¡ã«å ¥ãåã«ãæŒãããŠãããŠã»ãããã€ã³ãã3ã€ãããŸãã
- 欲匵ã£ãŠãããã説æããã«æäœéå¿ èŠãšæããã³ãã³ãã«çµã
- æåã«æããã³ãã³ãã¯ãã§ããã ããã«ã³ãã³ãã§
- å³è§£ãå ¥ãã
äžã€ç®ã®çç±ã¯ãäžæ°ã«è©°ã蟌ãŸããŠãå¿ããŠããŸãããã§ãã
äºã€ç®ã®çç±ã¯ãã·ã§ãŒããã³ããaliasã«ããã·ã§ãŒãã«ããã§ããæããŠããã£ãŠããªãã£ããã¶ã€ããŒããèªåã§æ€çŽ¢ããŠã欲ããæ
å ±ã«è¡ãã€ããã«å°ã£ãå Žé¢ããããŸããã
ãã«ã®ã³ãã³ããæããåŸã§ã·ã§ãŒãã«ãããå
±æããŠOKã§ãããããã§äžæ°ã«æããŠããŸããšå¿ããŠããŸããã¡ã§ãã
é·ãããŠå€§å€ãªã³ãã³ãã®ã·ã§ãŒãã«ããã ãæããããšãããããããŸãã
ãããŠäžã€ç®ã¯ããã®1ãã§ã話ãããšãããå³è§£ããããšã§ãäºã話ãããããããªããŸãã
ä»åã¯Qiitaã®ç»åã®å®¹éã®é¢ä¿ã§ãå
šãŠã«å³ãå
¥ããããšã¯ã§ããŸãããããå³è§£ã¢ããã€ã¹ããã¡ã¢ããŠãããŸãã
åèã«ããŠããã ããããšæããŸãã
â è¶ ç°¡ç¥ãªãªããžããªã®é¢ä¿æ§
ç§ãäœã£ãŠããç°å¢ãå³è§£ãããšãããªæãã«ãªããŸãã
æ®æ®µã®æ¥åã§äœ¿çšããã¢ã€ã³ã³ãæ·»ããŠäžãããšãçè§£ãããããã§ãã
ãšã³ãžãã¢ãªãããã®å³ã«éåæãèŠããã®ã§ã¯ãªãã§ããããã
ããŒã«ã«ãªããžããªãããµãŒããŒäžããšãå人PCäžãã®2ã€ã«åãããŠããŸãã
Gitã®èª¬æã ãã ãšããµãŒããŒäžã®éçºç°å¢ã§ã³ããããããŸãã
ãããå®éã«ã¯ãGitã§ã³ããããããŸã§ã«ãHTMLãã¡ã€ã«ãç»åãå人PCäžã§äœæããŠããŸãã
æå€ãšããã®é¢ä¿æ§ãããããããã¶ã€ããŒããã©ãã£ããšãã«å人PCã®ãã¡ã€ã«ã°ããä¿®æ£ããŠããµãŒããŒäžã®éçºç°å¢ã«æã£ãŠãããªããªããŠããšãå€çºããŠããŸããã
ãã¶ã€ããŒãèªåãäœã£ãã¢ããã©ãããã©ããžç§»åããŠããã®ããã€ã¡ãŒãžã§ããããã«ããŸãããã
â å°ã£ããšãã®help
äœããã£ããšãã«ãã°ã°ãã®ãããã§ããããããŠãhelpã«æžããŠæããã®ã§ãã
åŒã³åºãæ¹ãæããŠãããŸãããã
âGitã®ããã¥ã¢ã«ã確èªãã
git help
âGitã®ã³ãã³ãäžèЧã衚瀺
git help -a
âGitã®ãã¹ãŠãè©°ãŸã£ãŠããããã¥ã¢ã«
man git
â ãªã¢ãŒããšã®ããåã
ãªã¢ãŒããšããŒã«ã«ã§ããåãããæäœéã®ã³ãã³ãã3ã€ããã¯ã¢ããããŸããã
âãªã¢ãŒãã®ãã©ã³ãã«æŽæ°ããã£ãã確èªãã
- å³è§£ã¢ããã€ã¹
- ãªã¢ãŒãã¯ãŒãã³ã°ããªãŒã¯é²ãã§ããããããŒã«ã«ã®ã¯ãŒãã³ã°ããªãŒã¯é²ãã§ããªã
- fetchãããã³ãããã¯ãã©ãã«ãšã©ãŸã£ãŠããã®ããå³è§£ãã
git fetch
âãªã¢ãŒãã®ãã©ã³ãã®å€æŽããããŒã«ã«ã®ä»ãããã©ã³ãã«åã蟌ã
- å³è§£ã¢ããã€ã¹
- ãªã¢ãŒãã®ã¯ãŒãã³ã°ããªãŒãšãããŒã«ã«ã®ã¯ãŒãã³ã°ããªãŒãäžèŽããæ§åãå³è§£
- fetchãããªãã£ãæã«ãpullããããšã©ããªãããå³è§£ãã
- å®ã¯
fetch + mergeã®ã³ãã³ããªãã ããšå³è§£ãã
ååãéããã©ã³ãã«ãããšãã³ã³ããªã¯ããèµ·ããããšãããããšãå ±æããŠãããšäžå¯§ã§ãã
git pull [ãªã¢ãŒãå] [pullãããããã©ã³ãå]
âããŒã«ã«ã®ä»ãããã©ã³ãã®å€æŽãããªã¢ãŒãã®ãã©ã³ãã«æž¡ã
- å³è§£ã¢ããã€ã¹
- ããŒã«ã«ã®ã¯ãŒãã³ã°ããªãŒãšããªã¢ãŒãã®ã¯ãŒãã³ã°ããªãŒãäžèŽããæ§åãå³è§£
- ãã®ãšããä»ã®äººã
git fetchããŠãªãæãšããæã®èŠãæ¹ãå ±æããŠãããšãgit fetchããã¯ã»ãäœæ 倧äºãäŒãããã
git push [ãªã¢ãŒãå] [pushãããããã©ã³ãå]
â ãã©ã³ãæäœã®ã³ãã³ã
ãšã³ãžãã¢ã«åã£ãŠã¯å¿ããšãªããããããŸãããããã¶ã€ããŒãæåã«äœ¿ãããªãããååã ãããšæã3ã€ã®ã³ãã³ããšããªãã·ã§ã³ãäžã€éžã³ãŸããã
âããŒã«ã«ã®ãã©ã³ããæå®ãããã©ã³ãã«åãæ¿ãã
- å³è§£ã¢ããã€ã¹
-
git branchãšåãããŠãã©ã®ãããªå€åãèµ·ããã®ããèŠããããã«ãã
-
å³è§£ãšã¯ç°ãªããŸãããäœãå®ç掻ã®è¡åã«äŸãããšçè§£ãæ·±ãŸãæå©ãã«ãªããŸãã
ç§ã¯ãããã«ã®ãã§ãã¯ã¢ãŠãã¿ããã«ãåã®branchããåºãŠããã€ã¡ãŒãžãã§ããšäŸããŠã¿ãããã€ã¡ãŒãžãã€ããããã£ãã§ãã
git checkout [ç§»åå
ã®ããã©ã³ãå]
âããŒã«ã«ã«ããªãã®ãã©ã³ãããããã確èªãã
- å³è§£ã¢ããã€ã¹
- åè¿°ã®
git checkoutãšäžç·ã«ã©ã®ãããªå€åãèµ·ããã®ãèŠããããã«ãã
- åè¿°ã®
git branch
âããŒã«ã«ã«ãä»ãããã©ã³ããããŒã¹ã«ããŠæ°èŠã®ãã©ã³ããäœæãã
- å³è§£ã¢ããã€ã¹
- å®éã«ã§ãããã©ã³ããã©ããªãããèŠããããã«ãã
- ãã®ã³ãã³ãã ãã§ã¯ããã©ã³ãã®åãæ¿ããçµãã£ãŠããªãããšãæŒãããŠããã®ã倧äº
git branch [æ°èŠããã©ã³ãå]
git checkoutã®ãªãã·ã§ã³ãäžç·ã«å
±æãããšãããããããŸãããã
äžèšã®ã³ãã³ããå
±æãããšãã¯ãgit branchãšgit checkoutã®åœ¹å²ã®éãã®è©±ãããŠããããšã倧äºã ãšæããŸãã
git checkout -b [æ°èŠãã©ã³ãå]
â ã³ãããã®ããã®ã³ãã³ã
æ¬åœã«åããŠã®ãšãã¯äžèšã®3ã€ã®ã³ãã³ãã¯ãäžç·ã«å©ããŠå®è·µããŠã¿ããšè¯ããšæããŸãã
âããŒã«ã«ã®ãã©ã³ãå ã®ã倿Žããããã¡ã€ã«ã確èªãã
- å³è§£ã¢ããã€ã¹
- å®éã«ã³ãã³ããå©ãããšãã«ãã©ã®ãããªå€åãèµ·ããã®ãèŠããããã«ãã
git status
âããŒã«ã«ã®ãã©ã³ãå ã®å€æŽãã¡ã€ã«ãã³ãããç»é²ããããšãã«äœ¿ãã³ãã³ã
- å³è§£ã¢ããã€ã¹
- ãããGitã§åŒã£ãããããããã€ã³ãã§ã
- è²·ãç©ã«äŸããŠããè²·ãç©ã«ãŽã«å ¥ããã衚çŸãããšãçè§£ããŠããããã¶ã€ããŒãå€ãã£ãã§ã
ãã¹ããŒãžã³ã°ã«äžããããšãèšãããšããããšãšã³ãžãã¢ãªããåç¥ã§ãããã
ãã®ãã¹ããŒãžã³ã°ããšãæ¬çªåã®ãã¹ããŒãžã³ã°ãç°å¢ãšåãèšèã䜿ããŸãããã
1ã¶æåŸã®æ¯ãè¿ããŸã§ããããŠãã¹ããŒãžã³ã°ã«äžããããšã¯è¡šçŸããªãæ¹ãããããããããŸããã
git add [ã³ãããç»é²ããããã¡ã€ã«å]
âã³ãããç»é²ããããã¡ã€ã«ããã³ãããã¡ãã»ãŒãžãã€ããŠã³ããããã
- å³è§£ã¢ããã€ã¹
- åè¿°ã®
git addãšåãããŠãè²·ãç©ã§äŸãããªããã¬ãžã«éãããšè¡šçŸããŸãã
- åè¿°ã®
ã³ãããã¡ãã»ãŒãžãæžãããã«ããã«ã¯ãªãŒããŒã·ã§ã³ã¯ãå
šè§ã§æžããŠããŸã人ãå€ãã§ãã
åè§ã§æžãããšãã¢ããã€ã¹ã«ã远å ããŠãããšè¯ããšæããŸãã
git commit âm âã³ãããã¡ãã»ãŒã·ãâ
â ã³ãããå 容ã®ç¢ºèªã®ããã®ã³ãã³ã
âã³ãããå士ã®å·®ã確èªãã
- å³è§£ã¢ããã€ã¹
- CUIã§è¡šç€ºãããç»é¢ãèŠãªããããæ¶ãããã®ããšã远å ããããã®ããäžç·ã«ç¢ºèªãã
git diff [æ¯èŒãããã³ãããã®ID] [æ¯èŒããã³ãããã®ID]
âãã©ã³ãå ã®ãã³ããããšã¡ãã»ãŒãžã確èªãã
- å³è§£ã¢ããã€ã¹
- CUIããŒã«ã§è¡šç€ºãããç»é¢ãèŠãªãããäœãæžããŠããã®ã説æãã
git log
âgit log -p
- å³è§£ã¢ããã€ã¹
- CUIããŒã«ã§ã
-pãã€ãããšããšãã€ããªãã£ãæã®è¡šç€ºã確èªãã
- CUIããŒã«ã§ã
git log -p
ããã®5ãGitã䜿ãã ããæã®ãµããŒããå¿ããªããšã³ãžãã¢ã«ãã¥ã³ãšãã
â ãã©ãã£ããã¶ã€ããŒã話ããããããé°å²æ°ãäœã
æäœéã®ã³ãã³ããæããŠããå®åã§ã¯äºæ³å€ã®åºæ¥äºã«ééããããšãå€ã
ãããŸãã
ãã£ãšãã¶ã€ããŒã¯ãèªåã§è§£æ±ºã§ããªããªã£ããšãã«ãšã³ãžãã¢ã®ããªãã«é Œãã§ãããã
äŸãã°äžæ £ããªææã¯ãåžãè¿ãã«ãããªã©ãã¶ã€ããŒãã質åãããã空æ°ãäœãããã«å¿ãããŠããããã ãã§ããšãŠãå©ãããŸãã
å¯èœãªãããã¶ã€ããŒãã³ãŒãã£ã³ã°ããæ¥ã¯å·¥æ°ãå°ãéããŠãã
äŸãã°ãç§ã®æå±ããŠããããŒã ã§ã¯ããã¯ã€ãããŒãã倧ããªã«ã³ãã³ã«ããŠã¿ããªã§ã¿ã¹ã¯ç®¡çãããŠããŸããã
ãã®æ¥ã«ã©ããªäœæ¥ã«å
¥ãã®ããã«ã³ãã³ãèŠãªããæã®ããŒãã£ã³ã°ãããŠããã®ã§ããã¶ã€ããŒãã³ãŒãã£ã³ã°ã«å
¥ãã¿ã€ãã³ã°ãããããŸããã
ã©ããªãã©ãã«ãèµ·ãããŠããããã®æãŸã§ããããŸãããããã©ãã«å¯Ÿå¿ã«3å²çšåºŠãå·¥æ°ã®äœè£ãæã£ãŠãããšè¯ãã®ã§ã¯ãªãã§ããããã
äºåã«ãã¶ã€ããŒã®ãµããŒãã«å
¥ããåæã§äºå®ãç«ãŠãŠãããšããšã³ãžãã¢ã®ã¹ãã¬ã¹ãæžããå¿ç©ããã§ãããããšæããŸãã
ããã¯æªæ¥ãžã®æè³ã ãšæã£ãŠããã ãããšããããã§ãã
â 1ã¶æåŸã«ã¯æ¯ãè¿ããè¡ãã
1ã¶æããã䜿ã£ãŠãããšããã¶ã€ããŒäžäººã§åé¡ãªãéçšã§ããçµéšãããã°ããšãã§ããªãã³ã³ããªã¯ããèµ·ãããçµéšãããŸã£ãŠããŸãã
ãããŠãå®é䜿ã£ãããšã§ãªããšãªãGitã䜿ã£ãéçºç°å¢ã®æ§æãã€ãããŠããé åãã§ãã
ããã§åŸ©ç¿ããŠãããšã°ããšçè§£åãå¢ãããšã³ãžãã¢ããã®æé¢ããæ©ããªããŸãã
ãã€ã¯æ±ããŠããã¢ã€ã¢ã€ãçåãšããåœ¢ã§æŽããæ©äŒã«ãªãã®ã§ãGitãžã®ææå¿ããšãã®ãããŸãã
Gitææçã«é¥ã£ãŠãããã©ããã®ã倧äºãªã¿ã€ãã³ã°ã§ãã
â ãªã¢ãŒãã»ããŒã«ã«ã®ãªããžããªã®é¢ä¿æ§ãããããããã
ããã®4ãã®æåã®é ç®ã§ç޹ä»ããããè¶ ç°¡ç¥ãªãªããžããªã®é¢ä¿æ§ãã®å³ã掻çšããŠããªããã®ãããªæ§æãããŠããã®ããšã³ãžãã¢ããèæ¯ã®èª¬æãããŠãã ããã
1ã¶æåãªãããŒã«ã®é¢ä¿æ§ãšãèªåãã©ãã§äœæ¥ããŠããããããããããããŸããã§ããã
ä»ãªãããªããã®ãããªæ§æã«ãªã£ãŠããã®ããšã³ãžãã¢ãç°å¢ãéžæããçç±ã話ããŠããã£ãŠãããªããšãªãæ±²ã¿åããããã«ãªã£ãŠããŠãããšæããŸãã
ããã宿ãªè¡šçŸããããªããããã§ç°å¢ãæ¯ãè¿ãããšã§ãç°å¢ã«ã€ããŠãã¶ã€ããŒããç¡è¶ãªæ³šæãæžãã¯ãã§ãã
äŸãã°ãPhotoshopã®ããŒã¿ãGit管çããããªã©ã§ãã
ã³ã³ããªã¯ããããèµ·ããçç±
ã³ã³ããªã¯ãã§çãç®ãèŠãçµéšãããã°ããã»ã©ããã®è©±ãèªåäºåããŠèãããã¶ã€ããŒãå¢ããŠããã¯ãã§ãã
ãããŠãåãéã¡ã䟵ããªãããã«ãã©ã®ãããªå¯ŸåŠãããŠããã°ããã®ãèªåãã¡ã§èãã¯ãããŸãã
å³è§£ãã©ã€ãã³ãŒãã£ã³ã°ããªãããã³ã³ããªã¯ããèµ·ãããã¿ãŒã³ã埩ç¿ããŠã¿ãŠãã ããã
äž»ã«äžèšã®3ãã¿ãŒã³ãå€ããšæããŸãã
- åãããã¡ã€ã«ã®åããè¡ã倿ŽããŠããããã¿ãŒã³
- åãããã¡ã€ã«ãŠãè¿ããè¡ã倿ŽããŠããããã¿ãŒã³
- åãããã¡ã€ã«ã®äžçªäžã®è¡ã«ãåæã«æ°ãã远å ããŠããããã¿ãŒã³
è¯ãã³ãããã»ãã©ã³ãã®äœãæ¹
ãã¶ã€ããŒã®ã³ãããã¡ãã»ãŒãžã«ãäœæ¥ããšã ãå ¥ã£ãŠããŠãå°ã£ãããšã¯ãªãã§ããããïŒ
æåã®é ã¯ã³ãããã¡ãã»ãŒãžã«ãŸã§æ°ãé
ãããšã¯é£ããã£ããã¶ã€ããŒããããããã¯ãŒãã³ã°ããªãŒãèŠãããšãå¢ããŸããã
ä»ãªããšã³ãžãã¢ã®ãã ãããèšã£ãŠããçè§£ã§ããäžå°ãã§ããŠããã¯ãã§ãã
1)ã³ãããã«ã€ããŠ
- ã³ãããã®ç²åºŠã¯çްãã
- äžã€ã®å¯Ÿå¿ã«1ã³ãããã§ãããããã
- 现ããããšèšãããããããå°ã倧ããããŠã¿ã
- è¯ãã³ãããã¡ãã»ãŒãžãå¿ããã
- äœãã©ã®ããã«ããã®ãæ®ã
- ç°¡æœãªæç« ã§
ã³ãããã¡ãã»ãŒãžã®äŸ
git commit -m "[ä¿®æ£]ã©ã³ãã³ã°ã®ã¢ã€ã³ã³ãããã¹ãã«ãã蟌ãã§ããã®ãä¿®æ£"
2)ãã©ã³ãã«ã€ããŠ
- è¯ããã©ã³ãåãå¿ããã
- ã©ããªå€æŽãããã®ããæ³åããããååãã€ãã
- è±èªã§ã€ãã
- åèªã®åºåãã¯ãã-ãïŒãã€ãã³ïŒãã_ãïŒã¢ã³ããŒã¹ã³ã¢ïŒã§ã€ãªã
远å ã§æããŠãè¯ãããªGitã³ãã³ã
âHEADã®äœçœ®ã倿Žããã察ç
git checkout [ã³ãããID]
âbranchãé ããããŠãŠããŸãããŒãžã§ããªã察ç
git rebase [ãªããŒã¹å
ã®branchå]
ãªããŒã¹ã®ã¡ãªããã»ãã¡ãªãããäžç·ã«äŒããããããªãã远å ã§æããŠããããªãšæããŸãã
âäžã€åã®ã³ãããã«è¿œå ãã察ç
- ã³ããããå¿ãã倿Žããäžã€åã®ã³ãããã«æ··ããããšã
- ã³ããããå¿ãã倿Žããäžã€åã®ã³ãããã«æ··ããããšã
泚æã¯ããªã¢ãŒãã«pushæžã¿ã ãšãæŽå²ãå€ãã£ãŠããã®ã§ã¯ãŒãã³ã°ããªãŒãå¥ããŠããŸã
git commmit --amend
â倿Žããbranchã®äžéšã ããå¥ã®branchã«æã£ãŠããã察ç
git cherry-pick [æã£ãŠãããã³ãããã®ID]
âç¹å®ã®cssãæç« ãã©ãã«æžããŠããã®ãèŠã€ããã察ç
git grep [æ€çŽ¢ãããã¯ãŒã]
âäœæ¥ãããã¡ã€ã«ãã³ãããããã«ç Žæ£ããã察ç
git reset --hard
âäžèŠã«ãªã£ãããŒã«ã«ãã©ã³ããåé€ããã察ç
git branch -d [åé€ããããã©ã³ãå]
ãŸãšã
ãããŸã§ããGitææçã ã£ãç§ãããããªGitã®æãæ¹ãããŠããããšå¬ããããšæã£ãããšã§ãã
ããäžåºŠé ç®ã ãèŠãŠã¿ãŸãããã
- ããã®1ããå³è§£ããæŽ»çšãããç°¡åãã£ãŠåãã€ããªããšã³ãžãã¢ã¯ã¢ãã
- ããã®2ãGitã§å¹žãã«ãªãäžçãå ±æããŠããããšã³ãžãã¢ã¯çŽ æµã
- ããã®3ãç°å¢æ§ç¯ããµããŒãããŠããããšã³ãžãã¢ã¯ãã®ãããé Œããã
- ããã®4ããããæ¬çªããã¶ã€ããŒã«æåã«æããŠæ¬²ããGitã®ã³ãã³ã
- ããã®5ãGitã䜿ãã ããæã®ãµããŒããå¿ãããªããšã³ãžãã¢ã«ãã¥ã³ãšãã
ãããªã«ãã¶ã€ããŒã®ããšãèããŠãGitã«ã€ããŠæããŠããããšã³ãžãã¢ãçŸããããã³ãããšãã£ã¡ãããã¶ã€ããŒå€çºã§ããïŒ
ãããã«
ç§ã¯Gitã䜿ãããªãããŸã§æããšæã£ãŠããŸããããä»ã§ã¯ãšãŠã䟿å©ãªããŒã«ããšæã£ãŠããŸãã
ãªã®ã§ããã£ãšGitãæãã䜿ããã¶ã€ããŒãå¢ããŠã»ããã§ãã
ãã®ããã«ã¯ãšã³ãžãã¢ã®å©ããäžå¯æ¬ ã§ãã
é·ããªããŸããããæåŸãŸã§ç®ãéããŠããã ãããããšãããããŸãã
ãã®ãšã³ããªãŒãããªãã®ã圹ã«ããŠãã°å¹žãã§ãã
ãšã€ããŒã ã©ã€ãã¹ã¿ã€ã«ã¢ããã³ãã«ã¬ã³ããŒ2017ãææ¥ã¯ãã¶ã€ã³ããšã³ãžãã¢ãªã³ã°ãææŠãã@ayumikããããWebãµãŒãã¹éçšè ã¯å¿ ãå ¥ããŠãããããå¹çUPã®chromeãã©ã°ã€ã³ããæžããŠããããããã®ã§ããæ¥œãã¿ã«ã
远èš
誀åã®èšæ£ãè¡ããŸããã
@altããã@themeaningof8ããã@ihsiekããã@gimKondoãææããã ãããããšãããããŸããm(_ _)m


