[B! git] daisuke-mã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

daisuke-m id:daisuke-m

gitã«é–¢ã™ã‚‹daisuke-mã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (70)

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

${{author_name}}$
{{author_name}}{{created}}
{{ #comment }}{{ comment }}{{ /comment }}
- {{ label }}

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

ghq ã§ç®¡ç†ã—ã¦ã‚‹æ™‚ã«ãƒªãƒã‚¸ãƒˆãƒªä½œã‚‹ã®ã‚ã‚“ã©ã†ã ã£ãŸã®ã§é©å½“ãªæ„Ÿã˜ã§æ¥½ã‚’ã™ã‚‹è©± - ã¡ãªã¿ã«
photo by Chris Turner Photography ghq ã¨ peco ã‚’çµ„ã¿åˆã‚ã›ã¦ã‚ã£ã¡ã‚ƒã¹ã‚“ã‚Šã«ä½¿ã£ã¦ã„ã‚‹ã®ã ã‘ã‚Œã©ã€GitHub ä¸Šã«ã‚ã‚‹ãƒªãƒã‚¸ãƒˆãƒªã‚’å–ã£ã¦ãã‚‹ã®ã¯æ¥½ãªã‚“ã ã‘ã‚Œã©ã€ã¾ã ãƒªãƒã‚¸ãƒˆãƒªã‚’ä½œã£ã¦ãªãã¦ã“ã‚Œã‹ã‚‰ä½œã‚‹ã®ãŒé¢å€’ã ã£ãŸã®ã§ç°¡å˜ã«ä½œã‚Œã‚‹ã‚ˆã†ã«ã—ãŸã€‚ ã“ã‚Œã¾ã§ã¯ã€ghq ã§é©å½“ãªè‡ªåˆ†ã®ãƒªãƒã‚¸ãƒˆãƒªã«ç§»å‹•ã—ã¦ã€cd ../ && git init hoge ã¨ã‹ã—ã¦ã„ãŸã€‚ã‹ã¤ã€ã ã„ãŸã„ã¯ README.md ã‚’ä½œã£ã¦ã‚³ãƒŸãƒƒãƒˆã™ã‚‹ã€‚ã“ã®è¾ºã‚’ã¾ã¨ã‚ãŸã€‚ ã“ã‚Œã‚’ .zshrc ã¨ã‹ã«æ›¸ã„ã¦ãŠã„ã¦ã€ä½¿ã†ã¨ã‚ã£ã¡ã‚ƒã¹ã‚“ã‚Šã«ãªã‚‹ã€‚README.md ã‚’ä½œã‚‹ã®ã«ã€åå‰ã‚’ã‚ãƒ£ãƒ”ã‚¿ãƒ©ã‚¤ã‚ºã—ã¦ã„ã‚‹ã¨ã“ã‚ãŒ Zsh ã˜ã‚ƒãªã„ã¨å‹•ã‹ãªã„ã¨æ€ã†ã€‚ $ ghq-new test ã“ã‚“ãªæ„Ÿã˜ã§ãƒªãƒã‚¸ãƒˆãƒªã®åå‰ã ã‘æŒ‡å®šã™ã‚‹ã¨ã€ãƒªãƒã‚¸ãƒˆãƒªã¨ README.md ã‚’ä½œã£ã¦ã€ãã“ã«ç§»å‹•ã—ã¦ãã‚Œ
daisuke-m 2018/05/18
git

ghq
ãƒªãƒ³ã‚¯
Color in git-log
The git log --decorate will put by default: the HEAD in cyan the remote branches in red the tag in green and can be changed through color.decorate config. But the git log --format don't offer a way to display specifically the HEAD or remotes or branch: all three are displayed through %d, with one color possible. Update May 2013, as mentioned below by Elad Shahar (upvoted), git 1.8.3 offers one mor
daisuke-m 2017/08/04
git
ãƒªãƒ³ã‚¯
git describe with two tags on the same commit
daisuke-m 2016/12/21
git
ãƒªãƒ³ã‚¯
#github tips: hub pull-request ã®å‘ãå…ˆãŒãƒªãƒã‚¸ãƒˆãƒªã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ–ãƒ©ãƒ³ãƒã«ãªã‚‰ãªã„ã¨ã - è©©ã¨å‰µä½œãƒ»æ€ç´¢ã®ã²ã‚ã°
å¼•æ•°ãªã—ã® hub pull-request ã‚’å®Ÿè¡Œã™ã‚‹ã¨ã€ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ–ãƒ©ãƒ³ãƒã«å‘ã‘ãŸãƒ—ãƒ«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’ä½œã£ã¦ãã‚Œã¾ã™ã€‚ã“ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ–ãƒ©ãƒ³ãƒã¯ãµã¤ã† master ã‚’å‘ã„ã¦ã¾ã™ãŒã€å¤‰æ›´å¯èƒ½ãªã®ã§ Git Flow ã§è¨€ã† develop çš„ãªãƒ–ãƒ©ãƒ³ãƒã‚’ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ–ãƒ©ãƒ³ãƒã«ã—ã¦ã„ã‚‹ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã‚‚ã‚ã‚‹ã¨æ€ã„ã¾ã™ã€‚ ã•ã¦ã€ã“ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ–ãƒ©ãƒ³ãƒã‚’ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®æ´å²ã®ä¸ã®ã©ã“ã‹ã®æ™‚ç‚¹ã§å¤‰ãˆã‚‹ã¨ã€æ–°ã—ã clone ã—ãŸãƒªãƒã‚¸ãƒˆãƒªã§ hub pull-request ã™ã‚‹ã¨å½“ç„¶ develop ã«å‘ã‘ã¦ãƒ—ãƒ«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’ä½œã‚Šã¾ã™ãŒã€ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ–ãƒ©ãƒ³ãƒã®å¤‰æ›´ä»¥å‰ã«ã“ã®ãƒªãƒã‚¸ãƒˆãƒªã‚’ clone ã—ã¦ã„ãŸãƒªãƒã‚¸ãƒˆãƒªã§ hub pull-request ã™ã‚‹ã¨ master ã«å‘ã‘ãŸãƒ—ãƒ«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’ä½œã‚ã†ã¨ã—ã¦ã—ã¾ã„ã¾ã™ã€‚-b develop ã™ã‚Œã° develop ã‚’å‘ãã®ã ã‘ã©ã€ã“ã‚Œã¯äº‹æ•…ã®å…ƒ
daisuke-m 2016/08/24
github

git
ãƒªãƒ³ã‚¯
ãƒªãƒ¢ãƒ¼ãƒˆã«ç„¡ã„ãƒ–ãƒ©ãƒ³ãƒã¯ãƒãƒ¼ã‚«ãƒ«&ãƒˆãƒ©ãƒƒã‚ãƒ³ã‚°ã‹ã‚‰ã‚‚æ¶ˆãã†ã§ã¯ãªã„ã‹ - DRYãªå‚™å¿˜éŒ²
tl;dr ã•ã„ãã‚“ã¯ã€fetchã®ã¤ã„ã§ã«ã—ã¾ã™ã€‚ git fetch origin --prune ã‚ã‚‹ã„ã¯ã€ç›®çš„ã®ã“ã¨ã®ã¿ã—ãŸã„å ´åˆã¯ã€ git remote prune origin è¿½è·¡ãƒ–ãƒ©ãƒ³ãƒ å‰å›žã‚¨ãƒ³ãƒˆãƒªã§ã€è¿½è·¡ãƒ–ãƒ©ãƒ³ãƒ(tracking branch)ã®å‰Šé™¤æ–¹æ³•ã‚’çŸ¥ã‚Šã¾ã—ãŸã€‚ git branch -r -d REMOTE-NAME/BRANCH-NAME ãŠãƒ¼ã—ã€ã˜ã‚ƒã‚ãƒªãƒ¢ãƒ¼ãƒˆã«ç„¡ã„ãƒ–ãƒ©ãƒ³ãƒã¯ãƒãƒ¼ã‚«ãƒ«ãƒ–ãƒ©ãƒ³ãƒã‚‚ãƒˆãƒ©ãƒƒã‚ãƒ³ã‚°ãƒ–ãƒ©ãƒ³ãƒã‚‚æ¶ˆã™ã‚¹ã‚¯ãƒªãƒ—ãƒˆãŠã˜ã•ã‚“æ›¸ã„ã¡ã‚ƒã†ãžãƒ¼ï¼ã¨æ€ã£ãŸã‚‰ãã‚“ãªä¾¿åˆ©ã‚³ãƒžãƒ³ãƒ‰æ—¢ã«ã‚ã£ãŸã‚ˆããƒ¼ãã‚Šã‚ƒã‚ã‚‹ã‚ˆããƒ¼ã€ã£ã¦è©±ã€‚ ã¨ã‚Šã‚ãˆãš git remote show origin ã—ã¦ã€originã®çŠ¶æ…‹ç¢ºèªã—ã¦ã€ git remote prune origin ã™ã‚‹ã¨ã€REMOTE-NAME=originãªãƒ¬ãƒã‚¸ãƒˆãƒªã«ç„¡ã„ã‚‚ã®ã§ã€ãƒˆãƒ©ãƒƒã‚ãƒ³ã‚°ã«ã‚ã‚‹ãƒ–ãƒ©ãƒ³
daisuke-m 2016/08/03
git
ãƒªãƒ³ã‚¯
How to list all tags that contain a commit?
daisuke-m 2014/10/27
git
ãƒªãƒ³ã‚¯
gitã§å‰Šé™¤ã—ã¦ã—ã¾ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®å¾©å…ƒ - itochin2ã®æ—¥è¨˜ï¼ˆä»®ï¼‰
gitã§å‰Šé™¤ã—ã¦ã¯ãƒ€ãƒ¡ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¶ˆã—ãŸäº‹ãŒå¾Œã‹ã‚‰ç™ºè¦šã—ãŸå ´åˆã€ è©²å½“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å¾©å…ƒã•ã›ã‚‹æ–¹æ³•ã‚’ãƒ¡ãƒ¢ã€‚ â†“ã®ã€Œdel important fileã€ã®ã‚³ãƒŸãƒƒãƒˆã§æ¶ˆã—ãŸãƒ¤ãƒ„ã‚’å¾©å…ƒã•ã›ãŸã„ï¼ æ‰‹é †ï¼‘ï¼Žæ¶ˆã—ãŸã‚³ãƒŸãƒƒãƒˆã®ãƒãƒƒã‚·ãƒ¥ã‚’å–å¾—ã™ã‚‹ $ git rev-list -n 1 HEAD -- important.txt 53599a4616710108d8fd035cf3c303a036a3c59cã€ŒHEADã€ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãŒå…¨ã¦ã®ã‚³ãƒŸãƒƒãƒˆã‚’è¡¨ç¤ºã€‚ ã€Œ-n 1ã€ã§è¡¨ç¤ºã™ã‚‹æ•°ã‚’ï¼‘ã¤ã«çµžã‚‹ã€‚ ã€Œ-- ï¼œfilepathï¼žã€ã§å¯¾è±¡ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŒ‡å®šã§ãã‚‹ã€‚ SourceTreeã‚’ä½¿ã£ã¦ã‚Œã°ã€è¦–è¦šçš„ã«ã‚ã‹ã‚‹ã‚ˆããƒ¼ã€‚ æ‰‹é †ï¼’ï¼Žå‰Šé™¤å¯¾è±¡ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å¾©å…ƒ $ git checkout 53599a4616710108d8fd035cf3c303a036a3c59c^ -- important.txt $ ls R
daisuke-m 2014/05/20
git
ãƒªãƒ³ã‚¯
git reset --hard HEAD leaves untracked files behind
When I run git reset --hard HEAD, it's supposed to reset to a pristine version of what you pulled, as I understand it. Unfortunately, it leaves files lying around, as a git status shows a big list of untracked files. How do you tell git "Just bring it back to EXACTLY what was in the last pull, nothing more, nothing less"?
daisuke-m 2013/10/30
git
ãƒªãƒ³ã‚¯
http://blog.inouetakuya.info/entry/20120826/1345979787
daisuke-m 2013/10/23
git
ãƒªãƒ³ã‚¯
Git ã§å¤‰æ›´ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç°¡å˜ã«ç„¡è¦–ã™ã‚‹è¨å®š - æ°¸é ã«æœªå®Œæˆ
ç®¡ç†ä¸‹ã«ç½®ã‹ã‚Œã¦ã‚‹ã‚“ã ã‘ã©ãªãœã‹ç„¡é§„ã«å¤‰æ›´ã•ã‚Œã¦ã—ã¾ã†ãƒ•ã‚¡ã‚¤ãƒ«ã¨ã„ã†ã®ãŒãŸã¾ã«ã‚ã£ã¦ã€ã¾ã‚ç®¡ç†æ–¹æ³•è¦‹ç›´ã›ã¨ã„ã†è©±ã‚‚ã‚ã‚‹ã‚“ã ã‘ã©ã€ãã‚Œã‚‚å¶ã‚ãªã„å ´åˆã€ãã†ã„ã†ã®ã¯ç„¡è¦–ã—ãŸã„ã€‚ ãã®æ–¹æ³•ã«ã¤ã„ã¦ã¯ã“ã®è¨˜äº‹ãŒè©³ã—ã„ã®ã ã‘ã©ã€ç§ã¯ã“ã‚Œã‚’ä»¥ä¸‹ã®ã‚ˆã†ã« alias è¨å®šã—ã¦ã„ã‚‹ã€‚ [alias] ignore = update-index --assume-unchanged unignore = update-index --no-assume-unchanged ignored = !git ls-files -v | grep "^[a-z]"ã“ã‚Œã§ã€ git ignore {file} ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç„¡è¦–ã™ã‚‹ git ignored ç„¡è¦–ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§ã‚’è¡¨ç¤ºã™ã‚‹ git unignore {file} ç„¡è¦–ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…ƒã«æˆ»ã™ ã¨ã„ã†é¢¨ã«ç›´æ„Ÿçš„ã«æ‰±ãˆã‚‹ã®ã§ä¾¿åˆ©ã€‚
daisuke-m 2013/10/16
git
ãƒªãƒ³ã‚¯
Redirectingâ€¦
Redirectingâ€¦ Click here if you are not redirected.
daisuke-m 2013/06/25
git
ãƒªãƒ³ã‚¯
gitã§ã‚µãƒ–ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’å‰Šé™¤ã™ã‚‹ | Webã‚·ã‚¹ãƒ†ãƒ é–‹ç™ºï¼æ•™è‚²ã‚½ãƒªãƒ¥ãƒ¼ã‚·ãƒ§ãƒ³ã®ã‚¿ã‚¤ãƒ ã‚¤ãƒ³ã‚¿ãƒ¼ãƒ¡ãƒ‡ã‚£ã‚¢
å•é¡Œ git submodule ã§ä»–ã®ãƒªãƒã‚¸ãƒˆãƒª(ä»¥ä¸‹ã€Œã‚µãƒ–ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã€)ã®å†…å®¹ã‚’åŸ‹ã‚è¾¼ã‚€ã“ã¨ãŒç°¡å˜ã«ã§ãã‚‹ã®ã§ã™ãŒã€ ã”ãç¨€ã«è¿½åŠ ã—ãŸã‚µãƒ–ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’å‰Šé™¤ã—ãŸããªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ ã‚µãƒ–ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã®è¿½åŠ ã‚„æ›´æ–°ã¯ git submodule add ã‚„ git submodule update ã§ç°¡å˜ã«ã§ãã‚‹ã‚‚ã®ã®ã€ ä½•æ•…ã‹ git submodule rm ã‚µãƒ–ã‚³ãƒžãƒ³ãƒ‰ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ ã©ã†ã™ã‚Œã°å‰Šé™¤ã§ãã‚‹ã®ã§ã—ã‚‡ã†ã‹ã€‚ è§£æ±ºæ–¹æ³• submodule_name='The name of a submodule you want to remove.' submodule_path="$(git config --file .gitmodules --get "submodule.$submodule_name.path")" git rm --cached "$submodule_pat
daisuke-m 2013/05/01
git
ãƒªãƒ³ã‚¯
Git submodule ã®åŸºç¤Ž - Qiita
ã“ã®è¨˜äº‹ã¯ 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
daisuke-m 2013/05/01
git
ãƒªãƒ³ã‚¯
Stash on Docker - Atlassian Blogs
Products Featured Developers Product Managers IT professionals Business Teams Leadership Teams Featured Developers Product Managers IT professionals Business Teams Leadership Teams
daisuke-m 2013/04/30
git
ãƒªãƒ³ã‚¯
git-flow + maven-release-pluginç”¨ã®æ‰‹é †
git-flow-with-maven-release-plugin.rst git-flow + maven-release-pluginç”¨ã®æ‰‹é † å‰æ ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒ«ãƒ¼ãƒˆPOMã«ä»¥ä¸‹ã®è¨å®šãŒæ›¸ã‹ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚‹ã€‚ SCMæƒ…å ±ã®è¨å®š <scm> <connection>scm:git:git@yourhost.com/your-project.git</connection> <developerConnection>scm:git:git@yourhost.com/your-project.git</developerConnection> </scm> maven-release-pluginã®è¨å®š Mavenã®ãƒªãƒªãƒ¼ã‚¹å‡¦ç†ã‚’ãƒªãƒ¢ãƒ¼ãƒˆã«pushã—ãªã„ã‚ˆã†ã«ä»¥ä¸‹ã®è¨å®šã‚’è¿½åŠ ã€‚ <plugin> <groupId>org.apache.maven.plugins</groupId>
daisuke-m 2013/04/30
git

git-flow

Maven
ãƒªãƒ³ã‚¯
ã„ã¤ã‚„ã‚‹ã®ï¼ŸGitå…¥é–€
â†“ã®v1.1.0ç‰ˆã®æ–¹ãŒã€ã‚ˆã‚Šè¦‹ã‚„ã™ãæ”¹å–„ã—ãŸã‚‚ã®ã«ãªã£ã¦ã¾ã™ï¼ http://www.slideshare.net/matsukaz/git-28304397 ç¤¾å†…ã§é–‹å‚¬ã—ãŸGitå‹‰å¼·ä¼šã®è³‡æ–™ã€‚ SVNã¨ã®æ¯”è¼ƒã‚„ã€Gitã®å†…éƒ¨æ§‹é€ ã¨å„ã‚³ãƒžãƒ³ãƒ‰ã®é–¢ä¿‚ã€ãƒ–ãƒ©ãƒ³ãƒã‚„ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã¨ã®é–¢ä¿‚ã‚’åˆ†ã‹ã‚Šã‚„ã™ãèª¬æ˜Žã—ãŸã¤ã‚‚ã‚Šã€‚ ã“ã†ã„ã†è³‡æ–™ã«å¯¾ã™ã‚‹æŠ•ã’éŠçš„ãªã®ãŒã©ã†ãªã‚‹ã®ã‹æ°—ã«ãªã£ã¦ã„ãŸã®ã§ã€ã‚‚ã—ã‚ˆã‚ã—ã‘ã‚Œã°ãƒ»ãƒ»ãƒ»ï¼15å††ã‹ã‚‰ã§ãã‚‹ã‚½ãƒ¼ã‚·ãƒ£ãƒ«ã‚«ãƒ³ãƒ‘ã‚µãƒ¼ãƒ“ã‚¹ã ãã†ã§ã™m(_ _)m http://kampa.me/t/devRead less
daisuke-m 2013/03/25
git
ãƒªãƒ³ã‚¯
git flow feature finishã—ãŸå¾Œã«ãƒªãƒ¢ãƒ¼ãƒˆæ›´æ–°ã§æ°—ã¥ãã¨æ‚²ã—ã„å•é¡Œã¸ã®å¯¾å‡¦æ³• - cynipeã¨èªã‚€
7/21ã®SCM Boot Camp in Tokyo 3ã«Gitã®è¬›å¸«å½¹ã¨ã—ã¦å‚åŠ ã—ã¦ããŸã€‚ãã®æ™‚ã« id:ToMmY ã•ã‚“ã¨git-flow(ã‚‚ã—ãã¯git merge --no-ff)ã—ãŸå¾Œã«ãƒªãƒ¢ãƒ¼ãƒˆãŒæ›´æ–°ã•ã‚Œã¦ã„ã‚‹ã¨æ‚²ã—ã„ã¨ã„ã†è©±ã‚’ã—ã¦ãŸã‚‰git-flowã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚ã‚‹ã‹ã‚‰ä½¿ã†ã¹ãã¨ã„ã†è€³å¯„ã‚Šæƒ…å ±ã‚’ã‚²ãƒƒãƒˆ*1ã—ãŸã®ã§ã¾ã¨ã‚ã¦ã¿ã‚‹ã€‚ ä½•ãŒå•é¡Œã‹ï¼Ÿ git-flowã§é–‹ç™ºã‚’ã—ã¦ã„ã‚‹å ´åˆfeature startã§ãƒ•ã‚£ãƒ¼ãƒãƒ£ãƒ¼ãƒ–ãƒ©ãƒ³ãƒã‚’ä½œæˆã—ã¦ä½œæ¥ã‚’é€²ã‚ã€ãƒ•ã‚£ãƒ¼ãƒãƒ£ãƒ¼ã®å®Ÿè£…ãŒå®Œäº†ã—ãŸã‚‰feature finishã§developãƒ–ãƒ©ãƒ³ãƒã«ãƒžãƒ¼ã‚¸ã¨ã„ã£ãŸæµã‚Œã«ãªã‚‹ã€‚ ã“ã®æ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®æµã‚Œã¯ä»¥ä¸‹ $(develop) git flow feature start cool-feature $(feature/cool-feature) # ã‚¤ã‚±ã¦ã‚‹æ©Ÿèƒ½ã®å®Ÿè£…ï¼†ã‚³ãƒŸãƒƒãƒˆã‚³ãƒŸãƒƒãƒˆ $(fea
daisuke-m 2013/01/24
git

git-flow
ãƒªãƒ³ã‚¯
git-flowã®feature finishã§--no-ffãªmargeã«ãªã‚‰ãªã„ã¨ããŒã‚ã‚‹ - ã‚µãƒ³ã‚´ãƒ©ãƒœ
git-flowã‚’ã„ã˜ã£ã¦ã„ã¦ã€A successful Git branching modelã¿ãŸã„ãªãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚°ãƒ©ãƒ•ã«ãªã‚‰ãªãã¦æ‚©ã‚“ã§ã„ãŸã®ã§ã™ãŒã€ã‚„ã£ã¨è§£æ±ºã—ã¾ã—ãŸã€‚ å•é¡Œã¯ã€featureãƒ–ãƒ©ãƒ³ãƒã§é–‹ç™ºã—ã¦developãƒ–ãƒ©ãƒ³ãƒã«ãƒžãƒ¼ã‚¸ï¼ˆfeature finishï¼‰ã—ãŸã¨ãã«èµ·ã“ã‚Šã¾ã™ã€‚ãªãœã‹ã€ãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚°ãƒ©ãƒ•ãŒçœŸã£ç›´ãã«ãªã£ã¦ã—ã¾ã†ã¨ããŒã‚ã‚Šã¾ã™ã€‚ã¤ã¾ã‚Šã€featureãƒ–ãƒ©ãƒ³ãƒãªã‚“ã¦ãªã‹ã£ãŸï¼ã¨ã„ã†æ„Ÿã˜ã«ãªã‚Šã¾ã™ã€‚ èª¿ã¹ãŸã‚‰ã©ã†ã‚„ã‚‰ã€1å›žã—ã‹ã‚³ãƒŸãƒƒãƒˆã—ã¦ãªã„featureãƒ–ãƒ©ãƒ³ãƒã‚’feature finishã™ã‚‹ã¨ã€ffãªmargeã«ãªã£ã¦ã—ã¾ã†ã‚ˆã†ã§ã™ã€‚git-flowãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã®ä»•æ§˜ã¨ã„ã£ãŸã¨ã“ã§ã—ã‚‡ã†ã‹ã€‚ å‚è€ƒï¼šfeature finish not doing a --no-ff merge
daisuke-m 2013/01/24
ã»ã†ã€‚

git
ãƒªãƒ³ã‚¯
Log in with Atlassian account
We tried to load scripts but something went wrong. Please make sure that your network settings allow you to download scripts from the following domain: https://id-frontend.prod-east.frontend.public.atl-paas.net
daisuke-m 2013/01/24
git

github
ãƒªãƒ³ã‚¯
http://defunkt.io/hub/
daisuke-m 2013/01/12
git
ãƒªãƒ³ã‚¯
1 2 3 4 æ¬¡ã®ãƒšãƒ¼ã‚¸