Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
git init ãã¦ããä¸çªæåã®commitå 容ãã2çªç®ã®commitã¨ä¸ç·ã«ã¾ã¨ããããã¨å¾ã§æã£ãã ãã¼ããgit rebase -i HEAD~~ããã®fixupã§â¦ $ git rebase -i HEAD~~ fatal: Needed a single revision invalid upstream head~~ãã£ã»ã»ã»(ΦÏΦ) ä¸çªæåã®commitã¯git rebase -i HEADã»ã«ãããã§ã¯é¡ããªãã®ãã»ã»ã»ä¸çªæåã®commitã¯git rebase -i ã§ããªãã®ãã»ã»ã»ï¼â TAE â (@ken_c_lo) April 21, 2013 @ken_c_lo ããæ¹æ³ãã£ããç¥ãããã§ããã¼ã調ã¹ãéãã§ã¯ç¡ããããªã®ããã£ã¦ãèªåã§ãªãã¸ããªä½ãæã¯git flow initã使ã£ã¦æåã«ç©ºã®Initial commitãä½ãããã«ãã¦ã¾ã
åæ£ãã¼ã¸ã§ã³ç®¡çãè¯éºã«æ±ãããå å£ã§ãã GREE Advent calendar 2013 ã® 14 æ¥ç®ã¨ãã¦åå ããã¦ããã ãã¾ãã ãäºäººã«ç¶ã Haskell ã®è©±ãããããã¨æã£ãã®ã§ãããæ¥é½ç¡é£ãªéçºã®è©±ã«å¤æ´ãã¾ãã :o Java ã C++ ã«ã¯ OOP ã®æ¦å¿µãå¿ è¦ã§ãã£ãããã«ãåæ£ä½æ¥ã®èªèãèãã¾ã¾ git ã Mercurial ã使ããã¨ã¯é·æçã«ä¸å¹¸ãããããã¾ãã ã¨ããããã¸ã§ã¯ãã«ã¦ããã®ä¸é¨ãå¯ç£ç©ã®ããã«ã¦ã§ã¢ã¨ãã¦æ½åºãã¹ããã¢ããªã±ã¼ã·ã§ã³ã¨åé¢ããã ä¸å ·åããã£ãã®ã§åå ãæ¢ãããããä¾åé¢ä¿ãè¤éãããã®ã§ã³ã¼ããèªãéãæ¸ãããã ãã¹ããã¬ãã¥ã¼ãææ¡ããªãã¡ã¯ã¿ã®éç¨ãå¼·åããã ããã®ããã¸ã§ã¯ãã«è¿·æãæããªãããã«ãããã®ãã¼ã«ãæ¹è¯ãã¦ä½¿ãããã ãã¾ã¾ã§ä½æ°ãªãããããªããã ãããã¨æã£ã¦æéãããã¦ãã¾ããã§ãã
è±èªã³ãããã³ã¡ã³ãã«ä½¿ããããªãªã·ã£ã¬ãã¬ã¼ãºãèããã®ã§ãããã使ã£ã¦ãã¤é¡ã³ãããããããã¦ããããã£ã³ã¹ãèè¦çã ã¨çãæ¯æ¥ã§ã v, x, g, z ã¨ããã®ã¸ããå ¥ã£ã¦ãåèªã ã¨ãªããã«ãã³è¯ãå¢ãã tweak ã¨ããã¶ã¤ãã¼ã«ã¯ã ãã¶ä¾¿å©ã åèª æå³
Git åå¿è ãä¸ç´è ã«åãã¦ãç®ç«ããªããã©ä¾¿å©ãªã³ãã³ããç´¹ä»ãã¾ãã
ãã®è¨äºã¯ Git Advent Calendar 6æ¥ç®ã®è¨äºã§ãï¼ Git submodule ã£ã¦æåãããã«ããã¨æãã®ã§ãåºæ¬çãªèª¬æããããã¨æãã¾ãã git submodule ã¨ã¯ git submodule ã¯ãå¤é¨ã® git ãªãã¸ããªããèªåã® git ãªãã¸ããªã®ãµããã£ã¬ã¯ããªã¨ãã¦ç»é²ããç¹å®ã® commit ãåç §ããä»çµã¿ã§ãã Subversion ã§ããã¨ããã®ãexternal ã¨ä¼¼ã¦ãã¾ãã ãã¦ã解説ã®ãããæå ã«ããªãã¸ããªA (/path/to/a) ã¨Aã® submodule ã¨ãã¦ããã使ãä¾ã¨ã㦠Bootstrap (å Twitter Bootstrap) ãç»é²ãã¦ã¿ã¾ãã git submodule ãç解ããããã§éè¦ãªã®ã¯ã ãªãã¸ããªAãæã示ãsubmoduleã¨ãã¦ã®Bootstrapã®commit ç¾å¨ã®Bootstr
ãã1年以ä¸åã«ãªãã¾ãããã³ãããã¡ãã»ã¼ã¸ã®æ¸ãæ¹ã説æãã¾ããããã£ããã¾ã¨ããã¨ã以ä¸ã®ãã¨ã説æãã¦ãã¾ãã ããããããã³ãããã¡ãã»ã¼ã¸ãããã«å¤§åã ã©ã®ãããªã³ãããã¡ãã»ã¼ã¸ããããããããï¼å ·ä½ä¾ä»ãï¼ ãã®èª¬æããã¦ããããæ¥ã ã³ããããã¦ãããªãã§æ°ãã«å¾ããããã©ãããã°ãã£ã¨ããããããã³ãããã¡ãã»ã¼ã¸ã«ãªãããã¨ããç¥è¦ãå¢ãã¦ãã¾ãããããã¯ãã³ãããã¸ã®ã³ã¡ã³ããµã¼ãã¹ã®æä¾ãéå§ãã1ãã¨ãå½±é¿ãã¦ãã¾ãããã®ãµã¼ãã¹ã§ã¯ãã³ãããã¸ã³ã¡ã³ãããã¨ãã«ãã©ããã¦èªåã¯ä»ã®æ¸ãæ¹ããããã®æ¸ãæ¹ãããããããã¨æããããã説æãã¦ãã¾ãããã®éç¨ã§ããªãã¨ãªããã£ã¡ã®æ¹ããããããã ã£ããã®ããå ·ä½çã«ããããã¨ãã«ããæããã®ã§ãã£ã¡ã®æ¹ããããããã¨ä½ãããçç±ãèããããã«ãªãã¾ãããããã«ãããä»ã¾ã§ããããã®éçºè ã§ãªãã¨ãªãã ã£ãèããå ±æ
ãã¹ããçµããã¾ã§ã®æéã§æ¸ãã¦ã¿ãã Jenkinsã§ã¸ã§ããå®è¡ãããã¨ãã«ãå¤é¨ãã©ã¡ã¼ã¿ã§ä»»æã®ãã©ã³ãã対象ã«ãã«ãã§ããã¨å¢ãã«ã ä¾ãã°ãèªåã®ãã¼ã«ã«ãã©ã³ãããã¼ã¸ããã¾ãã«ããã¹ããéãã確èªãããå ´åã¨ãã ãããªã®ãã¼ã«ã«ã§ãã¹ããããã¼ãããããã£ã¦è¨ããããããããªããã ãã¹ãå ¨é¨éãã®ã«æéãæããããã«ãªã£ã¦ãã¨ãã¨ããããCIã«å®è¡ãæãã¦ããã¦ãã¨ã§ç¢ºèªããã»ãããã£ã¨å¹çãããã F.Y.I: Building github branches with Jenkins ã¸ã§ãã®è¨å® ããã«ãã®ãã©ã¡ã¼ã¿åãã«ãã§ãã¯ãã¤ãã¦ã以ä¸ã®ããã«branchã£ã¦ååã®ãã©ã¡ã¼ã¿ãè¨å®ãã¦ããã ãã½ã¼ã¹ã³ã¼ã管çã·ã¹ãã ãã§ãBranches to buildãã®ã¨ããã«ãè¨å®ãããã©ã¡ã¼ã¿ã§ãã"$branch"ãå ¥ãã¦ããã ã¸ã§ãã®è¨å®ã¯ä»¥ä¸ãä¸è¨ã®æ¹
PHPã«ã³ãã¡ã¬ã³ã¹2012 | æ¥æ¬æ大ã®PHPã®ç¥å ¸ å æ¥ 9/15 ã«è¡ããã PHP ã«ã³ãã¡ã¬ã³ã¹ã§ãGit 㨠Pull Request ãã¤ãã£ããã¼ã éçºã«ã¤ãã¦ãçºè¡¨ããã¦ãã¾ããã è³æã¨è£è¶³ ã¾ããçºè¡¨è³æã§ãã ããããã¦ã¡ã¤ã³ã®ä¸»å¼µãããã¨ããGit ã«ç§»è¡ãããã¨ããã®ã¯ããsvn ã®ã³ãã³ãã«å¯¾å¿ãã git ã®ã³ãã³ããè¦ãããã¨ããããGitHub Enterprise ãå°å ¥ãããå®äºããããã®ã§ã¯ãªããGit ãå©ç¨ããæãå¹ççãªãéçºããã¼ãæ¥åããã¼ãèãããã¼ã éçºã»éç¨ã«é©ç¨ãããã¨ãã§ãã 9/19 æç¹ã§ãã¾ã Speaker Deck ã® embed ã使ããªããªã£ã¦ããã®ã§ãªã³ã¯ãããã¦ããã¾ã (ãã®ãã¡å¯¾å¿ãã¦ãããã¨ãããã¨ã§âã¯æ¾ç½®) Presentation Not Found // Speaker Deck ãã¨è£è¶³ã£ã½ã
å人çãªã¡ã¢ ãã®ï¼ ãã®ï¼ã¯ [2010-04-29-1] ã«ãããã Git ã§ã¯ããã£ãä¸æ¥ã®ä½æ¥ã§ããã©ã³ããä½ããã¨ãè¯ããããåºæ¬ã ã©ã³ãã¯ä¿®æ£ãçµãã£ãã master ã« merge ãã¦åé¤ãã¤ã¾ã使ãæ¨ã¦ã å¥ãªä½æ¥ãå ¥ã£ãããmaster ããæ°ãã«ãã©ã³ããä½ãã cvs ã¨ã svn ã ã¨ãä½æ¥åä½æ¯ã«ãã£ã¬ã¯ããªãæã£ã¦ cvs checkout 㨠ããã¦ãããã©ãGit ã¯ããããã©ã³ãæä½ã®ã¿ã§ã§ããç¹ãè¶ ä¾¿å©ã ãã ãä»ã«éããããã©ã³ãæä½ãè¤éãªã®ã§ã¡ã¢ã¡ã¢ã (1) ãã¼ã«ã«ãã©ã³ãã®ç¢ºèª % git branch (2) ãªã¢ã¼ããã©ã³ãã®ç¢ºèª % git branch -r (1) + (2) % git branch -a (3) ãã¼ã«ã«ãã©ã³ã bar ã®ä½æ % git branch bar (4) ãã¼ã«ã«ãã©ã³ã bar ã¸ã®åã
ã¯ããã« ãåãããããã³ã¼ããæ¸ããããã³ã¼ãã¨ä¸ç·ã«ãã¹ããæ¸ããçã¯ã½ããã¦ã§ã¢éçºã«ããã¦å¤§åãªãã¨ã§ãããããããã¨åãããã大åãªãã¨ãã¦ãåãããããã³ãããã¡ãã»ã¼ã¸ãæ¸ãããããã¾ããããã¯ãã¾ãçç®ããã¦ããªããè¦éãããã¦ãããã¨ã§ãã ä»åã¯ãã³ãããã¡ãã»ã¼ã¸ã®åãããããã®å¤§åããããã¦ãåãããããããããã®æ¸ãæ¹ã説æãã¾ãã ã³ãããã¡ãã»ã¼ã¸ã¨ãã®å¤§åã ãã¼ã¸ã§ã³ç®¡çã·ã¹ãã ã¨ã³ããã ç¾å¨ãã»ã¨ãã©å ¨ã¦ã®ã½ããã¦ã§ã¢éçºã§ã¯SubversionãGitãªã©ã®ãã¼ã¸ã§ã³ç®¡çã·ã¹ãã ã使ã£ã¦ãã¾ãããã¼ã¸ã§ã³ç®¡çã·ã¹ãã ã使ããã¨ã«ããã¡ãªããã¨ããã®ã¯ãã½ããã¦ã§ã¢ã®å¤æ´ãè¨é²ããã¦ãããã¨ã«ããã¾ãã å ·ä½çãªã¡ãªããã¯3ã¤ããã¾ãã ã½ããã¦ã§ã¢ã®èª¿æ»ããããããªããã¨ã§ããç¾æç¹ã§ã®ã³ã¼ãã¨ãããã¦å¤æ´ã®å±¥æ´ã¨ãçµã¿åããããã¨ã§ããããããé常
åæ£ãã¼ã¸ã§ã³ç®¡çã·ã¹ãã ã®Gitã«ã¯æ§ã ãªãµãã³ãã³ããããã¾ããããã®ä¸ã®1ã¤ã§ãã git filter-branch ã使ç¨ããã¨ãéå»ã®ã³ããããå®å ¨ã«ç¡ãã£ãäºã«ãã¦ãã¾ããªã©ã®å¼·åãªã³ãããå±¥æ´ã®ç·¨éãå¯è½ã¨ãªãã¾ãã大ããªãªãã¸ããªã®ç¹å®ã®ãã£ã¬ã¯ããªä»¥ä¸ã®å 容ãã³ãããå±¥æ´ä»ãã§å¥ã®å°ããªãªãã¸ããªã¨ãã¦åãåºãããããã¡ã¤ã«ã®ä¸ã«æ¸ããã¦ããçã®ãã¹ã¯ã¼ããå±¥æ´ã®ä¸ããæ¶å»ããããã¨ããã®ã¯ããç´¹ä»ãããä¾ã§ãã ãã®ã¨ã³ããªã§ã¯å¥ã®ä¾ã¨ãã¦ãã³ãããã¡ãã»ã¼ã¸ã ããå¾ããã¾ã¨ãã¦ä¿®æ£ããæé ããç´¹ä»ãã¾ãããã å ã éå ¬éãªããã¸ã§ã¯ãã¨ãã¦éçºãé²ãã¦ãããã®ããå ¬éãªãã¸ããªã«ç§»åãããã¨ãªãã¨ããã¯ãæ©å¯æ å ±ã¯å®å ¨ã«åãé¤ãã¦ããå¿ è¦ãããã¾ãããªãã¸ããªã«æ ¼ç´ããã¦ãããã¡ã¤ã«ãã®ãã®ã®å 容ã®ç·¨éæ¹æ³ã«ã¤ãã¦ã¯ä¸è¨ã®ä¾ã§è§£èª¬ããã¦ãã¾ããããã以å¤ã®å ´åã¨ãã¦
ãã«ãã«ãã¡ã¯ã¼ã@hisaichi5518ã§ãã ä»ããã¤ããã¦ãä¼ç¤¾ã§ã¯æ¥å ±ãéããªããã°ãªãã¾ããã æ¬æ¥ã®æ¥åã¨ãæ¬æ¥ã®éæã¨ããéãã¢ã¤ãã§ããããããã®ã£ã¦çµæ§ããã©ãã§ããã ã¨ããããã§ãæ¥å ±ã軽ãèªååãã¾ãããï¼ ãªããããã³ã¼ããæ¸ãããã³ãããããã¨æãã¾ããã³ãããã®ãã°=è¡ã£ãæ¥åã®ãã°ã§ããï¼ï¼ï¼ï¼ï¼ï¼ï¼ ã¤ã¾ãgit logã§å ¨é¨è§£æ±ºããããã§ããä¼ç¤¾ã§svnã使ã£ã¦ãå ´åã§ããgit-svn使ãã°è§£æ±ºã§ãã $ git log --since=yesterday --author=hisaichi5518 --pretty=format:"- %s" ãããªã®æ¯åæã¤ã®ã ããã®ã§ã.bashrcã«aliasãæ¸ãã¾ãã alias nippou_='git log --since=yesterday --author=hisada --pretty=for
æãæµ®ããã Gitã®Tipsãåæãã¦ã¿ã¾ããã gitã®ã³ãã³ããã§è£å®ãã git-completion.bash ãå ¥ããã¨ãã§ã³ãã³ãã®è£å®ãå¹ãããã«ãªãã¾ãã ã¾ããPS1ã®è¨å®ãè¡ãã¨ç¾å¨ã®ãã©ã³ãåã常ã«bashä¸ã«è¡¨ç¤ºãããããã«ãªãã¾ãã ï¼Windowsã®å ´åãmsysgit ã¯æ¨æºã§å ¥ã£ã¦ã¾ãï¼ contrib/completion/git-completion.bash - GitHub ã¤ã³ã¹ãã¼ã«æ¹æ³ï¼å¼ç¨ï¼ # To use these routines: # # 1) Copy this file to somewhere (e.g. ~/.git-completion.sh). # 2) Add the following line to your .bashrc/.zshrc: # source ~/.git-completion.sh # # 3)
GitLabã¯Ruby/Ruby on Railsã§ä½ãããGitHubã¯ãã¼ã³ã§ãã GitHubã¯ææã§ãã©ã¤ãã¼ããªãã¸ããªãæã¦ã¾ãããããã§ãã»ãã¥ãªãã£ä¸ã®çç±ã§ãªãã¸ããªãå¤ã ãã§ããªãã±ã¼ã¹ã¯ãããã¨æãã¾ãããããªã¨ãã«ä½¿ã£ã¦ã¿ããã®ãGitLabãGitHubã¯ãã¼ã³ã§ãã ãã°ã¤ã³å¿ é ã«ãªãã¾ãã ãã°ã¤ã³ããå¾ã®ç»é¢ã§ããç»é²æ¸ã®ããã¸ã§ã¯ããä¸è¦§è¡¨ç¤ºããã¾ãã ä¸ã¤ã®ããã¸ã§ã¯ããé²è¦§ãã¦ãã¾ããã½ã¼ã¹ããªã¼ãåºã¾ããã½ã¼ã¹ããªã¼ã¯å³ã¸å³ã¸ã¹ã©ã¤ããã¦è¡¨ç¤ºããã¾ããGitHubã«ä¼¼ã¦ãã¾ãã ã½ã¼ã¹ã³ã¼ããã¤ã©ã¤ã¿ã¼ãå èµããã¦ãã¾ããrawã§ãã¡ã¤ã«ããã¦ã³ãã¼ãã§ãã¾ãã ã¿ã°ããã©ã³ããåãæ¿ãããã¨ãã§ãã¾ãã ã³ãããå±¥æ´ä¸è¦§ã§ãã ã³ããã詳細ã§ã¯Diffã確èªã§ãã¾ãã ã³ãããã«å¯¾ããã³ã¡ã³ãã確èªã§ãã¾ãã ãã¼ã è¨å®ã§ããè¤æ°äººã§ã®ã³ã©ãã¬ã¼ã·
ããã«ã¡ã¯ãä¸å·ã§ãã Gitã使ãå§ãã¦ãããSubversionã使ãæ©ä¼ããã£ããæ¸ã£ããã®é ã§ãã Gitã ã¨ãã¼ã«ã«ã ãã§ç°¡åã«ä½¿ãå§ããããã®ãããã§ãããæ°è»½ã«ã¤ãããbranchããmergeã®ããããããã¾ãã¾ãããã ã¤ã³ã¹ãã¼ã«ç´å¾ã®ç¶æ ã§ãæ®éã«å©ç¨ã§ãã¾ããã ã¡ãã£ã¨ããè¨å®ã§ããã«ä½¿ãããããªãæ¹æ³ããç´¹ä»ãããã¨æãã¾ãã â»ä»åãç´¹ä»ããå 容ã¯ããããç§ã®MacBookä¸ã§ã®åä½ç¢ºèªã¨ãªããWindowsç°å¢ã¯èæ ®ãã¦ãã¾ãããã容赦ãã ããã â ã¦ã¼ã¶ã¼åã¨E-mailã¢ãã¬ã¹ã®è¨å® ã¾ãã¯ãæåã«ã¦ã¼ã¶åã¨ãã¡ã¼ã«ã¢ãã¬ã¹ãè¨å®ãã¦ãã¾ãã¾ãããã $ git config --global user.name "yoshiki" $ git config --global user.email "[email protected]"
ãªãªã¼ã¹ãé害æ å ±ãªã©ã®ãµã¼ãã¹ã®ãç¥ãã
ææ°ã®äººæ°ã¨ã³ããªã¼ã®é ä¿¡
å¦çãå®è¡ä¸ã§ã
j次ã®ããã¯ãã¼ã¯
kåã®ããã¯ãã¼ã¯
lãã¨ã§èªã
eã³ã¡ã³ãä¸è¦§ãéã
oãã¼ã¸ãéã
{{#tags}}- {{label}}
{{/tags}}