[B! git] yoppiblogã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

yoppiblog id:yoppiblog

gitã«é–¢ã™ã‚‹yoppiblogã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (43)

${{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}}

How can you combine git add patch -p mode with diff's ignore-all-space
yoppiblog 2014/06/29
git
ãƒªãƒ³ã‚¯
git-flow cheatsheet
About git-flowã¯gitã®æ‹¡å¼µã§ã‚ã‚Šã€Vincent Driessenã®æå”±ã™ã‚‹ãƒ–ãƒ©ãƒ³ãƒãƒ¢ãƒ‡ãƒ«ã‚’å®Ÿç¾ã™ã‚‹ãŸã‚ã®é«˜åº¦ãªãƒªãƒã‚¸ãƒˆãƒªæ“ä½œã‚’æä¾›ã—ã¾ã™ã€‚ more â˜… â˜… â˜… ã“ã®ãƒãƒ¼ãƒˆã‚·ãƒ¼ãƒˆã¯åŸºæœ¬çš„ãªä½¿ã„æ–¹ã¨git-flowã®åŠ¹æžœã‚’è¡¨ã—ã¾ã™ã€‚ â˜… â˜… â˜… Basic tips Git flow ã¯ç´ æ™´ã‚‰ã—ã„ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³è£œåŠ©ã¨å‡ºåŠ›ã‚’æä¾›ã—ã¾ã™ã€‚ä½•ãŒèµ·ã“ã‚‹ã‹æ³¨æ„æ·±ãèªã¿è§£ã„ã¦ãã ã•ã„ã€‚ macOS Clientã® Sourcetree ã¯ç´ æ™´ã‚‰ã—ã„GUIã¨git-flowã‚µãƒãƒ¼ãƒˆã‚’æä¾›ã—ã¾ã™ã€‚ - Git-flow ã¯ãƒžãƒ¼ã‚¸ã™ã‚‹ã“ã¨ã‚’ãƒ™ãƒ¼ã‚¹ã¨ã—ã¦è€ƒãˆã‚‹ã‚½ãƒªãƒ¥ãƒ¼ã‚·ãƒ§ãƒ³ã§ã™ã€‚ãƒªãƒ™ãƒ¼ã‚¹ã¯è¡Œã„ã¾ã›ã‚“ã€‚ â˜… â˜… â˜… macOS Homebrew $ brew install git-flow-avh Macports $ port install git-flow-avh Linux $ apt
yoppiblog 2014/01/29
git
ãƒªãƒ³ã‚¯
ã‚³ãƒŸãƒƒãƒˆã—ãŸã‚‰å®®å´Žã‚ãŠã„ã«å‘Šç™½ã•ã‚Œã‚‹git hookã‚’ä½œã£ãŸã€‚ - soh335 memo
å‘Šç™½ã•ã‚ŒãŸã„ã¨æ€ã£ã¦ã€ å‘Šç™½ã—ã‚„ã™ãã—ãŸã‚Šã—ãŸãŒã€ç”·ã‹ã‚‰ã—ã‹å‘Šç™½ãŒæ¥ãªã„ã€‚ http://hisaichi5518.hatena blog.jp/entry/2012/11/10/003301 ã‚ˆãè€ƒãˆãŸã‚‰ã€å¤§äººã«ãªã£ã¦ã€ç¤¾ä¼šäººã«ãªã£ã¦ã€ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ã«ãªã£ã¦ã€ ãŠã˜ã•ã‚“ã¨è©±ã™ã“ã¨ã¯å¤šããªã£ãŸãŒã€å¥³ã®åã¨è©±ã™ã“ã¨ãŒãªã„ã€‚ å‘Šç™½ãªã‚“ã¦å¤¢ã®ã¾ãŸå¤¢ã ã¨æ°—ã¥ã„ãŸã€‚ ã§ã‚‚ã€ã‚„ã£ã±ã‚Šå¥³ã®åã«å‘Šç™½ã•ã‚Œã‚‹ã¨å¬‰ã—ã„ã€‚ ã¨ãã«å¯æ„›ã„å¥³ã®åã«å‘Šç™½ã•ã‚ŒãŸã‚‰å¬‰ã—ã„ã€‚ å¯æ„›ã„å¥³ã®åã¨ã„ãˆã°ã€å®®å´Žã‚ãŠã„ã ã¨æ€ã†ã€‚ å®®å´Žã‚ãŠã„ã«ã€Œä¼šã„ãŸã„æ—©ãå¸°ã£ã¦ãã¦ã€ã¨ã‹è¨€ã‚ã‚ŒãŸã„ã€‚æ—©ãå¸°ã‚ŠãŸããªã‚‹ã€‚ å®®å´Žã‚ãŠã„ã«ã€ŒãŠã‹ãˆã‚Šãªã•ã„ã€ã¨ã‹è¨€ã‚ã‚ŒãŸã„ã€‚æ—©ãå¸°ã£ã¦è‰¯ã‹ã£ãŸã€‚ ãªã®ã§ã€ã‚³ãƒŸãƒƒãƒˆã—ãŸã‚‰å®®å´Žã‚ãŠã„ã«å‘Šç™½ã•ã‚Œã‚‹git hookã‚’ä½œã£ãŸã€‚ ã‚³ãƒ¼ãƒ‰ã‚’æ›¸ã„ã¦ã‚³ãƒŸãƒƒãƒˆã‚’ã™ã‚‹ã€ãŸã£ãŸãã‚Œã ã‘ã§å®®å´Žã‚ãŠã„ã«ã€Œä¼šã„ãŸã„æ—©ãå¸°ã£ã¦ãã¦ã€ã¨ã‹è¨€ã‚ã‚Œã‚‹ã€‚æœ€é«˜
yoppiblog 2013/11/13
é«˜ã¾ã‚‹ã€‚

git
ãƒªãƒ³ã‚¯
Better control of git log formatting
yoppiblog 2013/10/25
git logã‚’æ•´å½¢ã™ã‚‹ã‚„ã¤

git
ãƒªãƒ³ã‚¯
GitExtensionsã§èªè¨¼ä»˜ãHTTPã§Clone, Pull, PushãŒã§ããªã„ã¨ãã®å¯¾å‡¦æ–¹æ³•
GitExtensionsã¯ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ãŸã¾ã‚“ã¾ã ã¨ã€èªè¨¼ä»˜ãHTTPã§ãƒªãƒ¢ãƒ¼ãƒˆã®Gitãƒ¬ãƒã‚¸ãƒˆãƒªã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã‚ˆã†ã¨ã™ã‚‹ã¨ã€ã‚¢ã‚¯ã‚»ã‚¹æ™‚ã«ã“ã¡ã‚‰ã«ä½•ã‚‚è¨Šã„ã¦ãã‚Œãªã„ã®ã§ã€ãã®ã¾ã¾ã‚¿ã‚¤ãƒ ã‚¢ã‚¦ãƒˆã™ã‚‹ã¾ã§ä½•ã‚‚ã—ãªã„ã§ã€ä½•ã‹ã‚’å¾…ã£ã¦ã—ã¾ã£ã¦ã„ã¾ã™ã€‚å®Ÿéš›ã«ã¯è£ã§ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã‹ã‚‰ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åã®å…¥åŠ›ã‚’å¾…ã£ã¦ã„ã‚‹ã‚ˆã†ãªã®ã§ã™ãŒã€ã“ã¡ã‚‰ã‹ã‚‰ãã‚Œã‚’å…¥åŠ›ã™ã‚‹æ‰‹æ®µãŒã‚ã‚Šã¾ã›ã‚“ã€‚ ã“ã‚Œã‚’å›žé¿ã™ã‚‹æ–¹æ³•ã¯äºŒç¨®é¡žã‚ã‚Šã¾ã™ã€‚ æ–¹æ³•1 _netrc(.netrc)ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä½œæˆã™ã‚‹ã€‚ C:\Users\è‡ªåˆ†ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åãƒ•ã‚©ãƒ«ãƒ€ã«_netrcã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«(.netrcã§ã¯ãªã„ã®ã§æ³¨æ„)ã‚’ä½œæˆã—ã€ä»¥ä¸‹ã®è¦é ˜ã§ã€ãƒ›ã‚¹ãƒˆåã€ãƒ¦ãƒ¼ã‚¶ãƒ¼åã€ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’è¨˜è¿°ã—ã¾ã™ã€‚ã“ã†ã™ã‚Œã°ã€Git/GitExtensionsã¯è¨å®šã•ã‚ŒãŸãƒ›ã‚¹ãƒˆåã®ãƒ›ã‚¹ãƒˆã«ã‚¢ã‚¯ã‚»ã™ã‚‹éš›ã«ãã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åã¨ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ä½¿ç”¨ã—ã¦ãƒã‚°ã‚¤ãƒ³ã™ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã®ã§ã€GitExtens
yoppiblog 2013/09/25
git
ãƒªãƒ³ã‚¯
More Git and GitHub Secrets
This is the brand-new, action-packed sequel to the original Git and GitHub Secrets talk I did in 2012. For one, it has more emoji. Git is a really powerful tool. A lot of that power is deeply hidden, and for good reason: it may only be valuable in certain use cases. You may not run into those use cases very often, but when you do, these lesser-known features might save you literally seconds of tim
yoppiblog 2013/07/25
git
ãƒªãƒ³ã‚¯
git grep by file extensions
yoppiblog 2013/07/12
git
ãƒªãƒ³ã‚¯
ã¯ã¦ãªã‚°ãƒ«ãƒ¼ãƒ—ã®çµ‚äº†æ—¥ã‚’2020å¹´1æœˆ31æ—¥(é‡‘)ã«æ±ºå®šã—ã¾ã—ãŸ - ã¯ã¦ãªã®å‘ŠçŸ¥
ã¯ã¦ãªã‚°ãƒ«ãƒ¼ãƒ—ã®çµ‚äº†æ—¥ã‚’2020å¹´1æœˆ31æ—¥(é‡‘)ã«æ±ºå®šã—ã¾ã—ãŸ ä»¥ä¸‹ã®ã‚¨ãƒ³ãƒˆãƒªã®é€šã‚Šã€ä»Šå¹´æœ«ã‚’ç›®å‡¦ã«ã¯ã¦ãªã‚°ãƒ«ãƒ¼ãƒ—ã‚’çµ‚äº†äºˆå®šã§ã‚ã‚‹æ—¨ã‚’ãŠçŸ¥ã‚‰ã›ã—ã¦ãŠã‚Šã¾ã—ãŸã€‚ 2019å¹´æœ«ã‚’ç›®å‡¦ã«ã€ã¯ã¦ãªã‚°ãƒ«ãƒ¼ãƒ—ã®æä¾›ã‚’çµ‚äº†ã™ã‚‹äºˆå®šã§ã™ - ã¯ã¦ãªã‚°ãƒ«ãƒ¼ãƒ—æ—¥è¨˜ ã“ã®ãŸã³ã€æ£å¼ã«çµ‚äº†æ—¥ã‚’æ±ºå®šã„ãŸã—ã¾ã—ãŸã®ã§ã€ä»¥ä¸‹ã®é€šã‚Šã”ç¢ºèªãã ã•ã„ã€‚ çµ‚äº†æ—¥: 2020å¹´1æœˆ31æ—¥(é‡‘) ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆå¸Œæœ›ç”³è«‹æœŸé™:2020å¹´1æœˆ31æ—¥(é‡‘) çµ‚äº†æ—¥ä»¥é™ã¯ã€ã¯ã¦ãªã‚°ãƒ«ãƒ¼ãƒ—ã®é–²è¦§ãŠã‚ˆã³æŠ•ç¨¿ã¯è¡Œãˆã¾ã›ã‚“ã€‚æ—¥è¨˜ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆãŒå¿…è¦ãªæ–¹ã¯ä»¥ä¸‹ã®è¨˜äº‹ã«ã—ãŸãŒã£ã¦æ‰‹ç¶šãã‚’ã—ã¦ãã ã•ã„ã€‚ ã¯ã¦ãªã‚°ãƒ«ãƒ¼ãƒ—ã«æŠ•ç¨¿ã•ã‚ŒãŸæ—¥è¨˜ãƒ‡ãƒ¼ã‚¿ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã«ã¤ã„ã¦ - ã¯ã¦ãªã‚°ãƒ«ãƒ¼ãƒ—æ—¥è¨˜ ã”åˆ©ç”¨ã®ã¿ãªã•ã¾ã«ã¯ã”è¿·æƒ‘ã‚’ãŠã‹ã‘ã„ãŸã—ã¾ã™ãŒã€ã©ã†ãžã‚ˆã‚ã—ããŠé¡˜ã„ã„ãŸã—ã¾ã™ã€‚ 2020-06-25 è¿½è¨˜ ã¯ã¦ãªã‚°ãƒ«ãƒ¼ãƒ—æ—¥è¨˜ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆãƒ‡ãƒ¼ã‚¿ã¯2020å¹´2æœˆ28
yoppiblog 2013/03/23
git
ãƒªãƒ³ã‚¯
git revert ã§è¤‡æ•°ã‚³ãƒŸãƒƒãƒˆã‚’æ‰“ã¡æ¶ˆã™ - miauã®ãƒ–ãƒã‚°
git ã«ã¯ã‚³ãƒŸãƒƒãƒˆã—ãŸå†…å®¹ã‚’å–ã‚Šæ¶ˆã™æ–¹æ³•ãŒã„ãã¤ã‹ã‚ã‚Šã¾ã™ãŒã€ã„ã£ãŸã‚“ãƒªãƒªãƒ¼ã‚¹ã—ãŸã‚³ãƒ³ãƒ†ãƒ³ãƒ„ã®å…¬é–‹æœŸé–“ãŒçµ‚äº†ã—ã¦ãã®å†…å®¹ã‚’å–ã‚Šä¸‹ã’ãŸã„ã‚ˆã†ãªå ´åˆã¯ã€git revert ã§ãƒªãƒªãƒ¼ã‚¹æ™‚ã®ã‚³ãƒŸãƒƒãƒˆã‚’æ‰“ã¡æ¶ˆã™ã‚³ãƒŸãƒƒãƒˆã‚’ä½œã‚‹ã®ãŒãŠä½œæ³•ã§ã™ã€‚ ä»Šå›žã¾ã•ã«ãã†ã„ã†çŠ¶æ³ã«ãªã£ãŸã‚“ã§ã™ãŒã€ãƒªãƒªãƒ¼ã‚¹æ™‚ã®ã‚³ãƒŸãƒƒãƒˆãŒè¤‡æ•°å›žã«ã¾ãŸãŒã£ã¦ãŠã‚Šã€ãã‚Œã‚‚ å…ˆã®ã‚¨ãƒ³ãƒˆãƒª ã§æ›¸ã„ãŸã‚ˆã†ã«ä»–ã®å¯¾å¿œã¨å…¥ã‚Šäº¤ã˜ã£ã¦ã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¦ã—ã¾ã£ã¦ã„ã¾ã™ã€‚ ã“ã†ã„ã†å ´åˆã«ã©ã† revert ã™ã‚Œã°ã„ã„ã‹ã¨ã„ã†è©±ã§ã™ã€‚ revert ã®åŸºæœ¬çš„ãªã¨ã“ã‚ ä¾‹ãˆã° 3a0e871f ã¨ã„ã†ã‚³ãƒŸãƒƒãƒˆã‚’æ‰“ã¡æ¶ˆã—ãŸã„å ´åˆã¯ã€ git revert 3a0e871fã‚’å®Ÿè¡Œã™ã‚Œã°ã€ Revert "xxx å¯¾å¿œ" This reverts commit 3a0e871ff60411ca89fa07c7f2b4d426fa04285d.ã®ã‚ˆã†ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒã¿
yoppiblog 2013/01/24
git
ãƒªãƒ³ã‚¯
Jenkinsã‚’ä½¿ã£ãŸiOSã‚¢ãƒ—ãƒªãƒ“ãƒ«ãƒ‰è‡ªå‹•åŒ–11 GitHubã¨Jenkinsã®é€£æº â€“ ãªã‚“ã¦ã“ã£ãŸã„
Hookã®æ©Ÿæ§‹ã‚’ä½¿ã†ã¨ã€GitHubã«å¤‰æ›´ãŒãƒ—ãƒƒã‚·ãƒ¥ã•ã‚ŒãŸã‚¿ã‚¤ãƒŸãƒ³ã‚°ã§è‡ªå‹•çš„ã«Jenkinsã®ã‚¸ãƒ§ãƒ–ãŒèµ°ã‚‹ã‚ˆã†ã«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãƒãƒ¼ãƒªãƒ³ã‚°ã«æ¯”ã¹ã¦ã€ãƒ—ãƒƒã‚·ãƒ¥ã‹ã‚‰ãƒ“ãƒ«ãƒ‰ã¾ã§ã®æ™‚å·®ãŒæ¸›ã‚Šã€ç„¡é§„ãªé€šä¿¡ã‚‚æ¸›ã‚Šã¾ã™ãŒã€ã‚¢ã‚¯ã‚»ã‚¹åˆ¶å¾¡ãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã‚‹å ´åˆã®è¨å®šã§å°‘ã—ã¯ã¾ã£ã¦ã—ã¾ã£ãŸã®ã§æ–¹æ³•ã‚’æ›¸ã„ã¦ãŠãã¾ã™ã€‚ Hookã‚’ãƒˆãƒªã‚¬ãƒ¼ã«ã—ãŸãƒ“ãƒ«ãƒ‰ Gitã«ã¯ã€ã‚³ãƒŸãƒƒãƒˆç›´å‰ã‚„ãƒ—ãƒƒã‚·ãƒ¥å®Œäº†æ™‚ãªã©ã€ä»»æ„ã®ã‚¿ã‚¤ãƒŸãƒ³ã‚°ã§ã‚¹ã‚¯ãƒªãƒ—ãƒˆã‚’å®Ÿè¡Œã§ãã‚‹Hookã¨ã„ã†æ©Ÿæ§‹ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®æ©Ÿæ§‹ã‚’åˆ©ç”¨ã™ã‚‹ã¨ã€ãƒ¬ãƒã‚¸ãƒˆãƒªã«å¤‰æ›´ãŒãƒ—ãƒƒã‚·ãƒ¥ã•ã‚ŒãŸã‚¿ã‚¤ãƒŸãƒ³ã‚°ã§Jenkinsã®ã‚¸ãƒ§ãƒ–ã‚’å®Ÿè¡Œã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ GitHubã®å ´åˆã¯ã€ãƒ¬ãƒã‚¸ãƒˆãƒªã®Admin -> Service Hooksãƒšãƒ¼ã‚¸å†…ã§Hookã®è¨å®šãŒã§ãã¾ã™ã€‚å¹¸ã„ã€Jenkinsã¨é€£æºã•ã›ã‚‹ãŸã‚ã®é …ç›®ãŒæœ€åˆã‹ã‚‰ç”¨æ„ã•ã‚Œã¦ã„ã¾ã™ã€‚ã“ã“ã§Jenkinså†…ã®ã‚¸ãƒ§ãƒ–å®Ÿè¡Œç”¨ã®URLã‚’æŒ‡
yoppiblog 2012/12/16
jenkins

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
yoppiblog 2012/11/30
git
ãƒªãƒ³ã‚¯
å±ãªããªã„gitã“ã¨ã€ã†ã¡ã®ãƒãƒ¼ãƒ ã®gitæˆ¦ç•¥è‰æ¡ˆ(ver. 2)
å±¥æ´ æ¥ã‚’å¿ã‚“ã§è¨˜äº‹ã‚’å…¬é–‹ã•ã›ã¦ã„ãŸã ã„ãŸãŠã‹ã’ã§ã€ã„ã‚ã„ã‚ãƒ•ã‚£ãƒ¼ãƒ‰ãƒãƒƒã‚¯ã„ãŸã ãã¾ã—ãŸã€‚ãƒ•ã‚£ãƒ¼ãƒ‰ãƒãƒƒã‚¯ã‚’å–ã‚Šè¾¼ã‚“ã§æ›´æ–°ã‚’è¡Œãªã£ã¦ã„ã¾ã™ã€‚ 2012/11/16: cherry-pickã—ã‚„ã™ã„ã‚ˆã†ã«ã€ã¨ã„ã†ãã ã‚Šã®ã¨ã“ã‚ã¯è«–ç†é€šã£ã¦ãªã„ã®ã§å‰Šé™¤ã—ã¾ã—ãŸã€‚ 1 pull req. 1 commitã®åŽŸå‰‡ã‚’ã‚„ã‚ã¾ã—ãŸã€‚è¨€ã„ãŸã„ã“ã¨ã§ã‚ã£ãŸã€Œè©¦è¡ŒéŒ¯èª¤ã®éŽç¨‹ã‚’å…¥ã‚Œãªã„ã§ã€ã‚’ä¸¸ãƒ‘ã‚¯ãƒªã—ã¾ã—ãŸï¼ > id:kazuho ãã®ä»–è¡¨è¨˜ä¿®æ£ã€ã‚¯ãƒªã‚¢ã‚³ãƒ¼ãƒ‰ã•ã‚“ã®è¨˜äº‹ã«èª¬æ˜Žä¸¸æŠ•ã’ãªã©ã€‚ ã¾ãˆãŒã gitã§ãƒˆãƒ©ãƒ–ã£ãŸï¼ã¨ã„ã†è©±ã‚’ä½•åº¦ã‹èžã„ãŸã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ãªã‚“ã§ãƒˆãƒ©ãƒ–ãƒƒã¦ã‚‹ã‚“ã ã‚ã†â€¦ã¨è©±ã‚’èžã„ãŸã¨ã“ã‚ã€åŒä¸€ã®ãƒªãƒ¢ãƒ¼ãƒˆãƒ–ãƒ©ãƒ³ãƒã«å¯¾ã—ã¦è¤‡æ•°äººãƒ»è¤‡æ•°ç’°å¢ƒã‹ã‚‰æ“ä½œãŒè¡Œã‚ã‚Œã¦ã„ã‚‹ã‚ˆã†ã§ã™ã€‚æ¥µç«¯ãªä¾‹ã‚’æŒ™ã’ã‚‹ã¨ã€masterãƒ–ãƒ©ãƒ³ãƒã—ã‹å˜åœ¨ã—ã¦ãŠã‚‰ãšã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’ã‚ãƒ¬ã‚¤ã«ã™ã‚‹ãŸã‚ã¨ç§°ã—ã¦git pull â€“rebaseã‚’å¸¸
yoppiblog 2012/11/17
yoi

git
ãƒªãƒ³ã‚¯
ã€ç¿»è¨³ã€‘ã‚ãªãŸã®çŸ¥ã‚‰ãªã„Git Tips
Mislav MarohniÄ‡ã•ã‚“ã® "A few git tips you didn't know about" ã‚’ç¿»è¨³ã—ã¾ã—ãŸã€‚ å…ƒè¨˜äº‹ã¯ã“ã¡ã‚‰ï¼š http://mislav.uniqpath.com/2010/07/git-tips/ ï¼ˆç¿»è¨³ã®å…¬é–‹ã¯æœ¬äººã‚ˆã‚Šè¨±è«¾æ¸ˆã¿ã§ã™ï¼‰ ç¿»è¨³ã®é–“é•ã„ç‰ãŒã‚ã‚Œã°é æ…®ãªãã”æŒ‡æ‘˜ãã ã•ã„ã€‚ ã‚ãªãŸã®çŸ¥ã‚‰ãªã„Git Tipsæ³¨æ„ï¼šã„ãã¤ã‹ã®ã‚³ãƒžãƒ³ãƒ‰ã‚„ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã¯ Git ã® version 1.7.2 ä»¥é™ãŒå¿…è¦ã§ã™ã€‚ OS Xã§ã¯ã€ Homebrew ã§ç°¡å˜ã«ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã§ãã¾ã™ï¼š brew install git git log ã§ãƒ–ãƒ©ãƒ³ãƒã¨ã‚¿ã‚°ã‚‚è¦‹ã‚‹$ git log --oneline --decorate 7466000 (HEAD, mislav/master, mislav) fix test that fails if current d
yoppiblog 2012/06/20
git
ãƒªãƒ³ã‚¯
Bridge Word
This shop will be powered by Are you the store owner? Log in here
yoppiblog 2012/06/19
git
ãƒªãƒ³ã‚¯
Setting up backup (mirror) repositories on GitHub
yoppiblog 2012/06/18
ãƒŸãƒ©ãƒ¼ãƒªãƒã‚¸ãƒˆãƒªã®ã¤ãã‚Šã‹ãŸ

git
ãƒªãƒ³ã‚¯
Gitã§ãƒžãƒ¼ã‚¸ã—ãŸãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ãŒconflictã—ãŸå ´åˆã®è§£æ±ºç–ï½œDIGITAL SQUADãƒ–ãƒã‚°
Gitã§ãƒžãƒ¼ã‚¸ã—ãŸãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ãŒconflictã—ãŸå ´åˆã®è§£æ±ºç– Gitã§ãƒžãƒ¼ã‚¸ã—ãŸéš›ã«ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã—ãŸå ´åˆ ç¾åœ¨ã„ã‚‹ãƒ–ãƒ©ãƒ³ãƒaã«ãƒ–ãƒ©ãƒ³ãƒbã‚’ãƒžãƒ¼ã‚¸ã—ãŸéš›ã«ã€db/development.sqlite3ãŒã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã—ãŸå ´åˆã€‚ ãƒ–ãƒ©ãƒ³ãƒaã®æ–¹ã‚’æŽ¡ç”¨ã™ã‚‹å ´åˆ git checkout --ours db/development.sqlite3 ãƒ–ãƒ©ãƒ³ãƒbã®æ–¹ã‚’æŽ¡ç”¨ã™ã‚‹å ´åˆ git checkout --theirs db/development.sqlite3 ãã®å¾Œã«git commit ã™ã‚‹ã€‚ ã¡ãªã¿ã«ã‚³ãƒ³ãƒ•ãƒªã‚¯ãƒˆã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ç¢ºèªã¯git ls-files -u ã‚¿ã‚°ï¼šRails git Tweet posted by digital-squad at 2010å¹´05æœˆ25æ—¥ 11æ™‚20åˆ† | Comment(0) | TrackBack(0) | Git ã“ã®è¨˜
yoppiblog 2012/04/27
git
ãƒªãƒ³ã‚¯
[git] å‰Šé™¤ã•ã‚ŒãŸremoteãƒ–ãƒ©ãƒ³ãƒãŒãƒãƒ¼ã‚«ãƒ«Repoã§æ¶ˆãˆãªããªã£ãŸã¨ã - satoko's blog - s21g
1Â $ git push origin local_deploy #é–“é•ã£ã¦ä½œæˆ 2Â $ git branch -a 3Â * master 4Â origin/HEAD 5Â origin/deploy 6Â origin/local_deploy #ãƒãƒ¼ã‚«ãƒ«ã«ã‚‚åæ˜ ã•ã‚Œã¦ã„ã‚‹ 7Â origin/master ã“ã‚Œã§ã‚µãƒ¼ãƒå´ã¯åæ˜ ã•ã‚Œã¾ã—ãŸã€‚ åˆ¥ã®ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒª(cloned)ã§å‰Šé™¤ãŒåæ˜ ã•ã‚Œãªã„ ã—ã‹ã—ã‚‚ã†ä¸€ã¤åˆ¥ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§åŒã˜gitãƒªãƒã‚¸ãƒˆãƒªã‚’cloneã—ã¦ã„ã¦ã€ãã¡ã‚‰ã§å‰Šé™¤ãŒåæ˜ ã•ã‚Œãªã„çŠ¶æ³ã«ã€‚ ä¸‹è¨˜ã®1.ã®èª¬æ˜Žã«ã‚ã‚‹ã‚ˆã†ã«ã€(remoteãƒ–ãƒ©ãƒ³ãƒã®è¿½åŠ ã¯è‡ªå‹•ã§ã•ã‚Œã‚‹ãŒ)å‰Šé™¤ã•ã‚ŒãŸã‚‚ã®ã¯ãƒãƒ¼ã‚«ãƒ«ã§æ˜Žç¤ºçš„ã«å‰Šé™¤ã—ãªã„ã¨ã„ã‘ãªã„ã‚ˆã†ã§ã™ã€‚ Delete unneeded branch $ git clone git://git.kernel.org/.../git.git
yoppiblog 2012/04/15
ã“ã‚Œã¿ã‚“ãªã«èªã¾ã›ã‚‹

git
ãƒªãƒ³ã‚¯
å›³è§£ Git
ã‚‚ã—å›³ã®è¡¨ç¤ºãŒãŠã‹ã—ã‹ã£ãŸã‚‰ã€ã“ã®ãƒšãƒ¼ã‚¸ã® SVGã§ãªã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’è©¦ã—ã¦ä¸‹ã•ã„ã€‚ SVG ã®ç”»åƒå‡¦ç†ã‚’ä¸æ¢ã—ã¦ã„ã¾ã™ã€‚ (SVG ã®ç”»åƒå‡¦ç†ã‚’å†é–‹) ã“ã®ãƒšãƒ¼ã‚¸ã®ã‚ªãƒªã‚¸ãƒŠãƒ«ã¯ã€Mark Lodato ã•ã‚“ãŒåŸ·ç†ã—ãŸ A Visual Git Referenceã§ã™ã€‚ ã“ã®ãƒšãƒ¼ã‚¸ã§ã¯ã€ã‚ˆãä½¿ã‚ã‚Œã‚‹ git ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’ç°¡æ½”ã«å›³ã‚’ç”¨ã„ã¦èª¬æ˜Žã—ã¾ã™ã€‚ git ã«ã¤ã„ã¦å°‘ã—çŸ¥è˜ãŒã‚ã‚‹ãªã‚‰ã€ã“ã®ãƒšãƒ¼ã‚¸ã¯ãã®çŸ¥è˜ã‚’æ•´ç†ã™ã‚‹ã®ã«å½¹ç«‹ã¤ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚ã“ã®ãƒšãƒ¼ã‚¸ãŒã©ã®ã‚ˆã†ã«ã—ã¦ä½œã‚‰ã‚ŒãŸã®ã‹èˆˆå‘³ãŒã‚ã‚‹ãªã‚‰ã€ç§ã®GitHub ãƒªãƒã‚¸ãƒˆãƒªã‚’è¦‹ã¦ä¸‹ã•ã„ã€‚(æ—¥æœ¬èªžè¨³ã® GitHub ãƒªãƒã‚¸ãƒˆãƒª) å†…å®¹ åŸºæœ¬çš„ãªä½¿ã„æ–¹ å‡¡ä¾‹ ã‚³ãƒžãƒ³ãƒ‰ã®è©³ç´° Diff Commit Checkout åˆ†é›¢HEADã§ã® commit Reset Merge Cherry Pick Rebase æŠ€è¡“ãƒ¡ãƒ¢ åŸºæœ¬çš„ãªä½¿ã„æ–¹ ä¸Šè¨˜4ã¤ã®ã‚³ãƒž
yoppiblog 2012/04/14
ã“ã‚Œã†ã¡ã®ãƒžãƒãƒ¼ã‚¸ãƒ£ã«ã¿ã›ã‚‹

git
ãƒªãƒ³ã‚¯
~nabeken/diary/ : git ã§é–“é•ã£ã¦ merge ã—ã¦ã—ã¾ã£ãŸå ´åˆ (fast forward ã§ãƒžãƒ¼ã‚¸ã—ã¦ã—ã¾ã£ãŸã®ã‚’å–ã‚Šæ¶ˆã—ãŸã„)
Posted on Wed May 21 22:41:31 +0900 2008 by nabeken åˆ¥ã®ãƒ–ãƒ©ãƒ³ãƒã§ä½œæ¥ã‚’ã—ã¦ã„ã¦ã€ã¾ãŸã€ãƒ–ãƒ©ãƒ³ãƒã‚’ä½œã£ã¦ä½œæ¥ã‚’ã—ã‚ˆã†ã¨æ€ã„ # git checkout -b moge // ã“ã‚Œã¯åˆ¥ã®ãƒ–ãƒ©ãƒ³ãƒã‹ã‚‰ã•ã‚‰ã«ãƒ–ãƒ©ãƒ³ãƒã‚’ä½œã‚‹æ“ä½œã§ã€ã‚„ã‚ŠãŸã‹ã£ãŸã®ã¯ä»¥ä¸‹ã®æ“ä½œ # git checkout -b moge master // master ã‹ã‚‰ã‚‚ã†1ã¤ãƒ–ãƒ©ãƒ³ãƒã‚’ä½œã‚ŠãŸã‹ã£ãŸ å‰è€…ã§ãƒ–ãƒ©ãƒ³ãƒã‚’ä½œã£ãŸã“ã¨ã«æ°—ãŒã¤ã‹ãšã€masterã«ãƒžãƒ¼ã‚¸ã—ã¦ã—ã¾ã£ãŸã€‚ã¾ã å…¬é–‹äºˆå®šã§ã¯ãªã„è¨˜äº‹ãŒãƒžãƒ¼ã‚¸ã•ã‚Œã¦ã—ã¾ã£ãŸã€‚ã•ã¦ã€ã©ã†ã—ã‚ˆã†ã€‚ gitk ã‚³ãƒžãƒ³ãƒ‰ã§æˆ»ã™ã¹ãHEADã‚’æœã—ã ã™ã€‚ãã® commit-ish ã‚’ master ã«ã™ã‚Œã°ã‚ˆã„ã€‚ãŸã ã—ã€masterã§ãªã‹ã£ãŸã“ã¨ã«ã—ãŸã„æœŸé–“ã®ã‚³ãƒŸãƒƒãƒˆã‚’å«ã‚€ãƒ–ãƒ©ãƒ³ãƒãŒã¾ã æ®‹ã£ã¦ã„ã‚‹ã“ã¨ã‚’ç¢ºèªã™ã‚‹ã“ã¨ã€‚ã•ã‚‚ãªã‘ã‚Œã°ã€ã‚³ãƒŸãƒƒãƒˆ
yoppiblog 2012/02/28
git
ãƒªãƒ³ã‚¯
.gitignore ãŒãƒªãƒã‚¸ãƒˆãƒªã«æ—¢ã«æœ‰ã‚‹å ´åˆã®å€‹äººçš„ãªç„¡è¦–è¨å®š - åœ°ç„ã®ãƒã‚³ãƒ–ãƒã‚°
ãƒªãƒã‚¸ãƒˆãƒªå†…ã«æ—¢ã«ã€ .gitignore ãŒæœ‰ã‚‹ã‚“ã ã‘ã‚Œã©å€‹äººçš„ãªç„¡è¦–è¨å®šã‚‚æ¬²ã—ã„å ´åˆã¯ã€ ./.git/info/exclude ã«æ›¸ã git help ignore
yoppiblog 2012/02/20
.git/info/excludeã«æ›¸ã

git
ãƒªãƒ³ã‚¯
1 2 3 æ¬¡ã®ãƒšãƒ¼ã‚¸