俺ã®ã‚ªãƒ¬ã‚ªãƒ¬git-flow | ãŠãらãã¯ãã‚Œã•ãˆã‚‚平凡ãªæ—¥ã€…
背景 一昨年末ãらã„ã«git-flowを採用ã—ã¦ã„㟠良ã„ã‚“ã ã‘ã©ã€çµæ§‹ã‚ã‚“ã©ãã•ã„ãªãƒ¼ã¨æ€ã†ã¨ã“ã‚ãŒã‚ã£ãŸ 去年é ã®æ–°è¦é–‹ç™ºã‹ã‚‰ã¯github-flowを採用(ã¨è¨€ã†ã‹ã”ã普通ã®Gité‹ç”¨) masterã®ãƒ†ã‚¹ãƒˆé€šã£ãŸã‚‰jenkinsã•ã‚“ãŒé–‹ç™ºã‚µãƒ¼ãƒãƒ¼åæ˜ ã—ã¦ãã‚Œã¦æ—ã‚‹ ãŸã 本番をãã‚Œã§é‹ç”¨ã™ã‚‹ã‚ã‘ã«ã‚‚ã„ã‹ãªã„ リリースタイミングã¨ã‹ã‚ã‚‹ masterã¯ãƒ‡ã‚¶ã‚¤ãƒŠãƒ¼ã‚„ME(=gitã«ä¸æ…£ã‚ŒãªäººãŸã¡)ãŒã‚«ã‚¸ãƒ¥ã‚¢ãƒ«ã«ç”»åƒã‚„テンプレをpushã§ãã‚‹(ãã‚Œã§æ§‹ã‚ãªã„) git-flowã¨github-flowã®ä¸é–“ãらã„ã®ãƒ•ãƒãƒ¼ã§é‹ç”¨ã™ã‚‹ã“ã¨ã« git-flowã®æ°—ã«å…¥ã£ã¦ã‚‹ç‚¹ã¨ãã†ã˜ã‚ƒãªã„点 æ°—ã«å…¥ã£ã¦ã„る点 並列ブランãƒã‚’走らã›ã‚‹ã¨ã„ã†ã®ã¯è‰¯ã„(git-flowã®å ´åˆã€masterã¨develop) hotfixãŒä¾¿åˆ© ã‚ã‚“ã©ãã•ã„所 releaseブランãƒæ¯Žå›žä½œã‚‹å¿…è¦æ€§ã‚’ã‚ã¾ã‚Šæ„Ÿã˜ãªã„ ãƒãƒ¼
git rebaseを使ã†ã¨ãã®ãƒ«ãƒ¼ãƒ« | Yakst
Re: [git pull] drm-next Linus Torvalds Sun, 29 Mar 2009 14:48:18 -0700 (訳注 : Daveã®rebaseã®ã‚„ã‚Šæ–¹ãŒå¥½ã¿ã§ãªã„ã¨ã„ã†Linusã«å¯¾ã—ã¦) > 2009å¹´5月29æ—¥(日曜日) Dave Airlieã®ç™ºè¨€ > > 今ã‹ã‚‰è‡ªåˆ†ãŒã—よã†ã¨ã—ã¦ã„ã‚‹ã®ã¯ã€ç›´ç·šã˜ã‚ƒãªã„ツリーをé€ã‚ã†ã¨ã—ã¦ã„ã‚‹ã ã‘ã 。 > パッãƒã‚’自分ã®æ¬¡ã®ãƒ„リーã«ãƒžãƒ¼ã‚¸ã™ã‚‹æ™‚ã¯ã„ã¤ã§ã‚‚ã€ãã“ã«ãã‚ŒãŒã‚ã‚‹ã‹ã‚‰ã 。 > 自分ã¯ã€Ericã®ãƒ„リーを自分ã®ãƒ„リーã«ç›´æŽ¥ãƒ—ルã—ã¦ã€ãã®çµæžœã‚’é€ã‚ã†ã¨ã—ã¦ã„る。 > ãã‚Œã„ãªãƒžãƒ¼ã‚¸å±¥æ´ã«ã¤ã„ã¦æ³¨æ„ã—ã¦ã„ã‚‹ã¨ã¯æ€ã£ã¦ã„ã‚‹ã‘ã©ã€å‰ã«è¨€ã£ãŸã‚ˆã†ã«ã€ > カーãƒãƒ«ãƒ„リーã«é–¢ã—ã¦ã®ãƒ‰ã‚ュメントãŒä½•ã‚‚ãªã„状態ã§ã¯ã€å›ãŒã©ã†ã—ãŸã„ã®ã‹ > 本当ã®ã¨ã“ã‚ã¯ä»Šã®ä»Šã¾ã§åˆ†ã‹ã‚‰ãªã„よ。 自分ãŒæ±‚ã‚ã¦ã„ã‚‹ã®ã¯ã€ãã‚Œã„ãªå±¥æ´ã 。ã§ã‚‚ã€ãã‚Œ
Home // Think Like (a) Git
Git shouldn't be so hard to learn. When you're just getting started, something as straightforward as a merge can be terrifying. It can take a long time to really become comfortable using some of Git's more advanced features. (It took me a year or two.) Once people achieve some level of Git enlightenment, they tend to make statements of the form 'Git gets a lot easier once you realize X' -- but tha
Git Koans / Steve Losh
Posted on April 8th, 2013. Inspired by Vim Koans. SilenceOne Thing WellOnly the GodsThe HobgoblinThe Long and Short of It Silence A Python programmer handed her ~/.gitconfig to Master Git. Among the many lines were the following: [alias] ; Explicit is better than implicit. If we want to merge ; we should do so ourselves. pull = pull --ff-only Master Git nodded. "git pull origin master," said the p
Git ã«é–¢ã™ã‚‹è‰¯è¨˜äº‹ - ã‚ã©ã‘ãªã„話
é©å®œè¿½åŠ ã—ã¾ã™ã€‚ Pro Git 僕ãŒèªã‚“ã Git ã®æ›¸ç±ã®ä¸ã§ã¯ã€ä¸€ç•ªåˆ†ã‹ã‚Šã‚„ã™ã„ã¨æ€ã„ã¾ã—ãŸã€‚日本語版ã®æ›¸ç±ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ç‰ˆãŒç¿»è¨³ã•ã‚Œã¦ã„ã¾ã™ã€‚ Pro Git 図解 Git Git ã®åˆå¿ƒè€…ãŒå‹•ä½œã‚’ç†è§£ã™ã‚‹ã®ã«ãŠã‚¹ã‚¹ãƒ¡ã€‚ 図解 Git ã“ã‚ããªã„ git ブランãƒã¨ãƒžãƒ¼ã‚¸ã®è€ƒãˆæ–¹ãŒã‚ˆã分ã‹ã‚‹ã‚¹ãƒ©ã‚¤ãƒ‰(@methaneã•ã‚“ã‹ã‚‰æ•™ãˆã¦é ‚ãã¾ã—ãŸ)。 ã“ã‚ããªã„ git ã‚ãªãŸã®çŸ¥ã‚‰ãªã„Git Tips 書ç±ã«ã¯è¼‰ã£ã¦ãªã„ Tips ã®è§£èª¬ã€‚知らãªã„ã¨æã™ã‚‹ã‹ã‚‚。 ã‚ãªãŸã®çŸ¥ã‚‰ãªã„Git Tips ワークフãƒãƒ¼ã€ã‚ã‚‹ã„ã¯ãƒ–ランãƒãƒ³ã‚° ãƒãƒ¼ãƒ ã§ãƒ–ランãƒã‚’使ã†éš›ã®å–り決ã‚。自分ã®ãƒãƒ¼ãƒ ã§ä¸€ã‹ã‚‰è°è«–ã™ã‚‹ã‚ˆã‚Šã€ã™ã§ã«ã‚ã‚‹ã‚‚ã®ã‚’å‚考ã«ã—ã¾ã—ょã†ã€‚ git-flow github-flow Github Enterprise Github Enterprise ã¯ã€ä¼æ¥å†…ã«è¨ç½®ã—ã¦ä½¿ã†ã“
Git 対 Mercurial：ãªãœ Git ã‚’é¸ã¶ã®ã‹ï¼Ÿ - Atlassian Japan
今回㯠Atlassian ã®é–‹ç™ºè€…ã§ã‚ã‚‹ Charles O’Farrell ã«ã‚ˆã‚‹ã‚²ã‚¹ãƒˆãƒ–ãƒã‚°ã§ã™ã€‚ãƒãƒ¼ãƒ ㌠DVCS ã¨ã—㦠Git ã‚’é¸æŠžã™ã‚‹ç†ç”±ã«ã¤ã„ã¦èª¬æ˜Žã—ã¾ã™ã€‚Charles ã¯ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚’ã»ã¨ã‚“ã© DVCS 上ã§è¡Œã„ã€ã¾ãŸ ClearCase ã‹ã‚‰ Git ã¸ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’移行ã•ã›ã‚‹ä½œæ¥ã‚’è¡Œã£ã¦ãã¾ã—ãŸã€‚ å‰å›žã®è¨˜äº‹ã§ã¯ã€åˆ†æ•£ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã¨ã—ã¦ãƒãƒ¼ãƒ ãŒãªãœ Mercurial ã‚’é¸æŠžã™ã‚‹ã®ã‹ã«ã¤ã„ã¦è€ƒãˆã¦ã¿ã¾ã—ãŸã€‚今回ã¯ã€åˆ†æ•£ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ (DVCS) ã¨ã—ã¦Â ãªãœ Git ãŒæœ‰åŠ›ãªé¸æŠžè‚¢ã§ã‚ã‚‹ã®ã‹ã«ã¤ã„ã¦è€ƒãˆã¦ã¿ã¾ã—ょã†ã€‚ 1970 å¹´ã®é»Žæ˜ŽæœŸã‹ã‚‰ã€ã‚®ãƒ¼ã‚¯ãŸã¡ã¯ã©ã¡ã‚‰ãŒå–„ã§ã©ã¡ã‚‰ãŒæ‚ªã‹ã¨ã„ã†è¡€ãªã¾ãã•ã„論争を長ã„é–“è¡Œã£ã¦ãã¾ã—ãŸã€‚ãã‚ŒãŒÂ Vim 㨠Emacs ã¨ã®é–“ã®æˆ¦ã„ã§ã™ã€‚最近ã§ã¯ã€ãã‚Œã¨ã¯åˆ¥ã®ãƒ„ールセットã«ã¤ã„ã¦ã€ã‚®ãƒ¼ã‚¯ãŸã¡ã¯æœ¬æ¥ã®ä»•äº‹ãã£ã¡ã®ã‘
Git & GitHub & kintone ã§ã‚¦ãƒ«ãƒˆãƒ©ãƒãƒƒãƒ”ãƒ¼ï¼ - Cybozu Inside Out | サイボウズエンジニアã®ãƒ–ãƒã‚°
ï¼–æ³ã¨ï¼“æ³ã®å¨˜ãŒã„る山本泰宇（@ymmt2005）ã§ã™ã€‚ã“ã‚“ã«ã¡ã¯ã€‚ ã„ããªã‚Šã§ã™ãŒã€æ‚”ã—ã„ã§ã™ã€‚ãªã«ãŒã£ã¦ã€@DQNEO ã•ã‚“ãŒæœ€è¿‘書ã‹ã‚ŒãŸè¨˜äº‹ã€Œå¿…殺ï¼Githubå°Žå…¥ã«å‘ã‘ã¦ä¸Šå¸ã‚’説得ã™ã‚‹æ™‚ã«ä½¿ãˆã‚‹è³‡æ–™ã¾ã¨ã‚ã€ã«è¼‰ã‚Šæãã¦ã—ã¾ã£ãŸã‹ã‚‰ã§ã™ã€‚ サイボウズã§ã‚‚ Git 㨠GitHub Enterprise ã‚’å°Žå…¥ã—ã¦ã„ã¾ã™ã€‚導入やé‹ç”¨ã®åŠ©ã‘ã«ãªã‚‹è³‡æ–™ã‚„ツールを作ã£ãŸã‚Šã—ã¦ã€ã¨ã¦ã‚‚便利ãªã®ã§ã„ãšã‚Œå…¬é–‹ã—ãŸã„ãªã¨æ€ã£ã¦ã„ãŸã‚“ã§ã™ã€‚å¿™ã—ã•ã«ã‹ã¾ã‘ã¦å¾Œå›žã—ã«ã—ã¦ã„ãŸã‚‰ã€å‡ºé…ã‚Œä¼æ¥ã«ã‚°ãƒ«ãƒ¼ãƒ”ングã•ã‚Œã¦ã—ã¾ã†ãªã‚“ã¦ï¼ˆæ¶™ï¼‰ 出é…ã‚Œã¦ã—ã¾ã£ãŸä»¥ä¸Šã€ãªã«ã‹ãƒ—ラスアルファをãŠè¦‹ã›ã™ã‚‹ã—ã‹å誉挽回ã®æ–¹æ³•ã¯ã‚ã‚Šã¾ã›ã‚“。何も失ã£ã¦ã„ãªã„ã‚“ã˜ã‚ƒãªã„ã‹ã¨ã„ã†ãƒ„ッコミã¯ã‚ˆã—ã¦ãã ã•ã„。ã“ã†ãªã£ãŸã‚‰æ¥ã‚‚外èžã‚‚ãªã Subversion 時代ã®æ¥ãšã‹ã—ã„éŽåŽ»ã‚’ã•ã‚‰ã‘出ã—ã€ã‚‚ã¡ã‚ん資料も出ã—ã¦ã€ã•ã‚‰ã«ãƒŽã‚¦ãƒã‚¦ã‚’è©°ã‚込んã ツー
Gitã®ãƒ™ã‚¹ãƒˆãƒ—ラクティクスã£ã½ã„ã‚‚ã® - Sexually Knowing
tbaggery - A Note About Git Commit Messages A successful Git branching model » nvie.com Commit Often, Perfect Later, Publish Once—Git Best Practices ã ã„ãŸã„ã“れらã«æ›¸ã„ã¦ã‚ã‚‹ã“ã¨ã‚’考ãˆã¦ã„る。 基本的ã«Git Successful Branch Modelã§é‹ç”¨ã™ã‚‹ã€‚git-flowを入れã¦ä½¿ã£ã¦ã„ã‚‹ã‘ã©ã€æ‰‹ã§ã‚„ã£ã¦ã‚‚ãã‚“ãªã«é¢å€’ã§ã¯ãªã„ã—好ããªã‚ˆã†ã«ã—ãŸã‚‰ã‚ˆã•ãã†ã€‚ Subversionを個人ã§ä½¿ã£ã¦ã„ãŸã“ã‚ã¯ãƒ–ランãƒã¯ã‚ˆãã‚ã‹ã‚‰ãªã„ã‘ã©æã—ã„ã‚‚ã®ã ã£ãŸã‘ã©ã€Gitを使ã„ã¯ã˜ã‚ã¦ã ã„ã¶è¦ªã—ã‚るよã†ã«ãªã£ãŸã€‚ æ–‡å—通りã€ãƒ–ランãƒã€æžã§ã‚る。気軽ã«æ‰±ãˆã‚‹ã¨ã„ã†ã“ã¨ã¯ç†è§£ã®åŠ©ã‘ã«ã‚‚ãªã‚‹ã€‚ コミットã®å˜ä½ è«–ç†çš„ã«æœ€å°é™åº¦ã®ã‚³ãƒŸãƒƒãƒˆã‚’ã¤ãる。「ã“ã†
A Visual Git Reference
If the images do not work, you can try the Non-SVG version of this page. SVG images have been disabled. (Re-enable SVG) This page gives brief, visual reference for the most common commands in git. Once you know a bit about how git works, this site may solidify your understanding. If you're interested in how this site was created, see my GitHub repository. Also recommended: Visualizing Git Concepts
git-flow ã«ã‚ˆã‚‹æ§‹æˆç®¡ç†ã¨Redmineã®é–¢ä¿‚ - プãƒã‚°ãƒ©ãƒžã®æ€ç´¢
「git-flow ã«ã‚ˆã‚‹ãƒ–ランãƒç®¡ç†ã€ã¨ã„ã†è¨˜äº‹ã§ã€åˆ†æ•£ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ãƒ„ールを使ã£ãŸæ§‹æˆç®¡ç†æ‰‹æ³•ã‚’ã¨ã¦ã‚‚分ã‹ã‚Šã‚„ã™ã書ã‹ã‚Œã¦ã„ãŸã€‚ 以å‰åƒ•ãŒæ›¸ã„ãŸè¨˜äº‹ã‚’見直ã—ã¦ã€ç†è§£ãŒè¶³ã‚Šãªã‹ã£ãŸéƒ¨åˆ†ãŒã‚ã£ãŸã¨æ„Ÿã˜ãŸã®ã§ã€ã‚‚ã†ä¸€åº¦ã¾ã¨ã‚ã¦ã¿ãŸã€‚ ã€å…ƒãƒã‚¿ã€‘ git-flow ã«ã‚ˆã‚‹ãƒ–ランãƒã®ç®¡ç† - O'Reilly Japan Community Blog A successful Git branching model を補助ã™ã‚‹ git-flow を使ã£ã¦ã¿ãŸ - Twisted Mind 見ãˆãªã„ãƒã‚«ãƒ©: A successful Git branching model を翻訳ã—ã¾ã—㟠A successful Git branching model: プãƒã‚°ãƒ©ãƒžã®æ€ç´¢ Mercurialã§ç‹¬ç«‹ä¸¦è¡Œãƒªãƒªãƒ¼ã‚¹ç®¡ç†: プãƒã‚°ãƒ©ãƒžã®æ€ç´¢ Mercurialã«ã‚ˆã‚‹ãƒã‚±ãƒƒãƒˆé§†å‹•é–‹ç™ºã¯å¼·åŠ›ã ï¼: プãƒã‚°ãƒ©ãƒž
Git for Computer Scientists
Abstract Quick introduction to git internals for people who are not scared by words like Directed Acyclic Graph . Storage In simplified form, git object storage is "just" a DAG of objects, with a handful of different types of objects. They are all stored compressed and identified by an SHA-1 hash (that, incidentally, isn't the SHA-1 of the contents of the file they represent, but of their represen
GitHub時代ã®ã‚ªãƒ¼ãƒ—ンソース・プãƒã‚¸ã‚§ã‚¯ãƒˆã¨ã®ä»˜ãåˆã„æ–¹
â– GitHub時代ã®ã‚ªãƒ¼ãƒ—ンソース・プãƒã‚¸ã‚§ã‚¯ãƒˆã¨ã®ä»˜ãåˆã„æ–¹ GitHubã¸pull requestã™ã‚‹éš›ã®ãƒ™ã‚¹ãƒˆãƒ—ラクティスã‹ã‚‰master ブランãƒã§ pull request ã—ã¦ã„ã„ã®ã¯å°å¦ç”Ÿã¾ã§ã£ã¦ã“ã¨ã‚‚ãªã„ã®æµã‚Œã‚’èªã‚“ã§ã„ã¦ã€å…ˆæ—¥ruby-listã§ã‚ã£ãŸRedmineã®Ruby1.9,Rails3対応ã®è©±ã‚’æ€ã„出ã—ãŸã€‚ã‚ã®ã¨ãã¯æŠ•ç¨¿è€…ã¯ç´å¾—ã—ã¦ã€ã€ŒGitHub時代ã®ã‚³ãƒ³ãƒˆãƒªãƒ“ューションã®ä»•æ–¹ã€ã¿ãŸã„ãªã‚‚ã®ã‚’ç†è§£ã—ã¦ãã‚ŒãŸã‚ˆã†ãªã®ã ã‘ã©ã€ãã®ä¸Šã§ã€Œmasterã§ãƒ‘ッãƒä½œã‚‹ãªã€çš„ãªãŠä½œæ³•ã‚’生真é¢ç›®ã«å—ã‘å–ã‚Šã™ãŽã¦æ•·å±…を高ãæ„Ÿã˜ã¦ã—ã¾ã‚ã‚Œã¦ã‚‚困るよãªãã¨æ€ã£ãŸã€‚ ãã“ã§ã€ã€ŒGitHub時代ã«ãƒ•ãƒªãƒ¼/オープンソース・ソフトウェア(以下FOSS)プãƒã‚¸ã‚§ã‚¯ãƒˆã¨ä»˜ãåˆã†ãŸã‚ã®äº”ヶæ¡ã€çš„ãªã‚‚ã®ã‚’ã¾ã¨ã‚ã¦ã¿ãŸã€‚ã¾ãã€ãã‚“ãªå¤§ãã‚ŒãŸã‚‚ã®ã§ã‚‚ãªã„ã‘ã©ã€‚ 1. 貢献ã—よã†ã¨æ„æ°—è¾¼ã¾ãªã„ FOS
GitHubã¸pull requestã™ã‚‹éš›ã®ãƒ™ã‚¹ãƒˆãƒ—ラクティス - hnwã®æ—¥è¨˜
ã¿ãªã•ã‚“ã€Git使ã£ã¦ã¾ã™ã‹ï¼Ÿåƒ•ã¯ã¾ã メインã®VCSãŒSubversionãªã®ã‚‚ã‚ã£ã¦ã€ãªã‹ãªã‹æ…£ã‚Œã¾ã›ã‚“。ã›ã£ã‹ãGitを使ã£ã¦ã„ã‚‹ã®ã«ã€ã¡ã‚‡ã£ã¨ä¸ä¾¿ãªSubversionãらã„ã®ä½ç½®ã¥ã‘ã§ã™ã€‚ã§ã‚‚ã€åŒã˜ã‚ˆã†ãªç†è§£åº¦ã®äººã£ã¦å¤šã„ã‚“ã˜ã‚ƒãªã„ã§ã—ょã†ã‹ã€‚ 一方ã§ã€æœ€è¿‘ã¯GitHub管ç†ã®ã‚ªãƒ¼ãƒ—ンソースプãƒã‚¸ã‚§ã‚¯ãƒˆãŒå¢—ãˆã¦ãã¾ã—ãŸã€‚ãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã‚’é€ã‚‹ã«ã—ã¦ã‚‚pull request*1ãŒå‰æã®ã‚ˆã†ãªç©ºæ°—ãŒã‚ã‚Šã€Gitåˆå¿ƒè€…ã«ã¯å°‘ã—æ•·å±…ãŒé«˜ã„å°è±¡ãŒã‚ã‚Šã¾ã™ã€‚ ãã‚“ãªåƒ•ã‚‚先日åˆpull requestã‚’ã—ã¦ã¿ãŸã‚“ã§ã™ãŒã€è‰²ã€…ãªå¤±æ•—ã®ç©ã¿é‡ãã§æ®‹å¿µãªpull requestã«ãªã£ã¦ã—ã¾ã„ã¾ã—ãŸã€‚ãã®åçœã‚’å…ƒã«ã€æœ¬ç¨¿ã§ã¯pull requestã™ã‚‹éš›ã®ãƒ™ã‚¹ãƒˆãƒ—ラクティスを紹介ã—ã¾ã™ã€‚ã“ã‚Œã¯ã€ŒGit Workflowã€ã‚’ベースã«ã‚³ãƒžãƒ³ãƒ‰ä¾‹ãªã©ã‚’åŠ ç†ã—ãŸã‚‚ã®ã§ã™ã€‚ æ¦‚è¦ pull requestã™ã‚‹éš›ã¯ã€
リリースã€éšœå®³æƒ…å ±ãªã©ã®ã‚µãƒ¼ãƒ“スã®ãŠçŸ¥ã‚‰ã›
最新ã®äººæ°—エントリーã®é…ä¿¡
j次ã®ãƒ–ックマーク
kå‰ã®ãƒ–ックマーク
lã‚ã¨ã§èªã‚€
eコメント一覧を開ã
oページを開ã
SIOS Tech. Lab - エンジニアã®ãŸã‚ã«ãªã‚‹æŠ€è¡“トピックス
Git: the NoSQL Database
ãŸã®ã—ã„Gitã¨ãƒªãƒ¢ãƒ¼ãƒˆãƒšã‚¢ãƒ—ムagatsuma survive #3
GitLab
Introduction
http://defunkt.io/hub/
Wingman App
{{#tags}}- {{label}}
{{/tags}}