SlideShareä¸ã®æ¬è³æã¯ç¾å¨ã¡ã³ãããã¦ãã¾ããã âââSpeakerDeckçãã覧ãã ããï¼ï¼æã ã¢ãããã¦ã¾ãï¼âââ https://speakerdeck.com/ihcomega56/githazimefalse-buRead less
SlideShareä¸ã®æ¬è³æã¯ç¾å¨ã¡ã³ãããã¦ãã¾ããã âââSpeakerDeckçãã覧ãã ããï¼ï¼æã ã¢ãããã¦ã¾ãï¼âââ https://speakerdeck.com/ihcomega56/githazimefalse-buRead less
ï¼»Chapter1-01ï¼½ Gitã使ã£ããã¼ã¸ã§ã³ç®¡ç ãã¼ã ã§éçºãè¡ãä¸ã§ããã¯ãæ¬ ãããªãåå¨ã¨ãªã£ãGitãã§ããGitãå©ç¨ãããã¨ããªãæ¹ããã¼ã¸ã§ã³ç®¡çãããããããªãæ¹ã¯ãGit ãä½ããããã®ãªã®ããããããããªãã§ããããã¾ãã¯Git ã«ãããã¼ã¸ã§ã³ç®¡çã®å¤§ã¾ããªã¤ã¡ã¼ã¸ãã¤ããã§ããã¾ãããã 2015å¹´6æ17æ¥ï¼TEXTï¼å¤§ä¸² è â 誰ããã¤ãã©ã®ãã¡ã¤ã«ã®ä½ãå¤æ´ãããã管ç ããéçºããã¸ã§ã¯ãããã¼ã ã§è¡ã£ã¦ããç¾å ´ãããã¼ãããã®ãã¡ã¤ã«èª°ãæ´æ°ããï¼ãããããããã¯ã§ããããããã©ãå¤ããã®ï¼ãããã¼ã¨ããã¯â¦â¦ä½è¡ç®ã ã£ãããªâ¦â¦ ãã1ã«æã ããï¼ãããããä½ã«æãããããã¡ã¢ã£ã¨ãããã ãã©ããã¼ã¨ãã®ã¡ã¢ãã©ãã®ãã©ã«ãã«å ¥ãããã¨â¦â¦ãããããã誰ã ãããã¡ã¤ã«ä¸æ¸ããã¡ãã£ããã¤ï¼ï¼ããããããç§ãããããã®æ¸ããã¨ãããå ã«æ»ã£ã¦ããã
ç®æ¬¡ ã¯ããã« Git ã使ã£ããã¨ããªãæ¹ã¸ çã®ãã¼ã¿ãè¦ããæ¹ã¸ Git ã®å ¨ä½å .git ã®ä¸èº« Git ãªãã¸ã§ã¯ããã¼ã¿ãã¼ã¹ 4種é¡ã®ãªãã¸ã§ã¯ã ãªãã¡ã¬ã³ã¹ ãªãã¡ã¬ã³ã¹ã®ãªãã¡ã¬ã³ã¹ 大ããªããªã¼ Git ãªãã¸ã§ã¯ãã® ID 㨠ä¸èº« ããã·ã¥é¢æ° SHA1 ã®ç°¡åãªèª¬æ tree 㨠blob ãªãã¸ã§ã¯ã tree 㨠blob ã®åç §é¢ä¿ ã«ã¼ãããªã¼ã® ID ã§ããªã¼å ¨ä½ãèå¥ãã commit ãªãã¸ã§ã¯ã ãªãã¡ã¬ã³ã¹ã¨ãã©ã³ã ãã©ã³ã ãã©ã³ãå é ãæããªãã¡ã¬ã³ã¹ HEAD ãªãã¡ã¬ã³ã¹ detached HEAD 2種é¡ã®ã¿ã° ä¸æå¾ é¿ (stash) ã¤ã³ããã¯ã¹ ãã£ãã·ã¥ã¨ãã¦ã®å½¹å² ãã¼ã¸ Fast-Forward ãã¼ã¸ non Fast-Forward ãã¼ã¸ rebase reset 2種é¡ã®ãã©ã³ã åãªãã¸ããªãèªåã®ãã©ã³ãã
触ããã®ããããã¦ãã£ã¨Gitãé¿ãã¦æ¥ã¾ãããã§ããã使ããªããã°ãªããªãç¶æ³ã«è¿½ãè¾¼ã¾ããã®ã§åå¿è ãªããå°ããã¤ã³ããããããããªããGitã®ä½¿ãæ¹ãå¦ãã§ãããGitã£ã¦ããããã¦æ¥½ãããã!!ã£ã¦æãããã«ãªãããã£ã¨Gitã®äºãå¦ã³ããã¦è²ã åå¼·åºæ¥ãè³æããµã¤ããéãã¦ãã¦æ å ±ããã¾ã£ã¦æ¥ãã®ã§ãããã§ã¾ã¨ãã¦ãã¤ã§ãè¦ããããã«ãããã¨æãã¾ãã Gitã®ä»çµã¿ãåªããæãã¦ãããã¹ã©ã¤ã ç´ æµãªã¹ã©ã¤ããããã¾ããã®ã§ãç´¹ä»ããã¦ããã ãã¾ãã ãããè¦ããã!è¦ããããã¼!! Gitãåå¼·åºæ¥ããµã¤ã ãµã«ã§ããããGitå ¥é ãµã«ã§ããããGitå ¥é ä¸çä¸ãããããã説æãã¦ãããµã¤ãã§ããåã§ããããã¾ããã Learn Git Branching Learn Git Branching ã²ã¼ã æè¦ã§åå¼·ãããæã¯ãã¡ãããã®ãµã¤ãèªä½ãããã ç¬ Gitã³ãã³ã
社å åãã«ãããããªã Gitãã¨ããã¿ã¤ãã«ã®ã¹ã©ã¤ããä½ã£ã¦çºè¡¨ãã¾ããã 対象è ã¯ããã¼ã¸ããªãã¨ãªãæãããã¨ã©ã¼ãæããããªãã¼ã¹ä½¿ããªã£ã¦è¨ããã¦æããã¨ãGit ãæãã¨æã£ã¦ãã人ã§ãï¼ ããããªã Git from Kota Saito çºè¡¨ä¸ã«åºã質åãªã© è£è¶³ãå ¼ãã¦ãä¸ã®ã¹ã©ã¤ããçºè¡¨ããéã«åºã質çå¿çãªã©ãããã«æ¸ãã¦ããã¾ãã Q: 常㫠Non Fast-Forward (--no-ff) ã§ããã®ã§ã¯ãã¨æãããã© git merge ãããã©ã«ãã 㨠Fast-Foward or Non Fast-Forward (--ff) ãªã®ã¯ãªãï¼ A1: Non Fast-Forward ã ã¨ã確ãã«ã¡ãªãããå¤ãã®ã§ããã1ç¹ã ããã¡ãªãããããã¾ããç¹ã«å·®åãç¡ãç¶æ 㧠git merge --no-ff ããã¨ã空ã®ãã¼ã¸ã³ããããä½ããã¦ãã¾ãã®ã§ãã
ãªãªã¼ã¹ãé害æ å ±ãªã©ã®ãµã¼ãã¹ã®ãç¥ãã
ææ°ã®äººæ°ã¨ã³ããªã¼ã®é ä¿¡
å¦çãå®è¡ä¸ã§ã
j次ã®ããã¯ãã¼ã¯
kåã®ããã¯ãã¼ã¯
lãã¨ã§èªã
eã³ã¡ã³ãä¸è¦§ãéã
oãã¼ã¸ãéã
{{#tags}}- {{label}}
{{/tags}}