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

yanagikouta id:yanagikouta

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

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

Gitã§ä»Šä½œã£ãŸã‚³ãƒŸãƒƒãƒˆã‚’ä»¥å‰ã®ã‚³ãƒŸãƒƒãƒˆã«åŠè‡ªå‹•çš„ã«èžåˆã•ã›ã‚‹(rebase autosquash)
ã‚ˆãã€Œãƒˆãƒ”ãƒƒã‚¯ãƒ–ãƒ©ãƒ³ãƒã«ãŠã‘ã‚‹ã‚³ãƒŸãƒƒãƒˆã¯ã€ãƒˆãƒ”ãƒƒã‚¯ã«é–¢é€£ã—ãŸå†…å®¹ã®ã¿ã€è«–ç†çš„å˜ä½ã§å°ã•ãä½œã‚Œã€ã¨ã„ã‚ã‚Œã¾ã™ãŒã€å®Ÿéš›ã«ã‚³ãƒ¼ãƒ‰ã‚’æ›¸ã„ã¦ã„ã‚‹ã¨ãã¯æœ€åˆã‹ã‚‰å®Œç’§ã ã¨æ€ãˆã‚‹ä¸€é€£ã®ã‚³ãƒŸãƒƒãƒˆã‚’ã¤ãã‚Šä¸Šã’ã‚‹ã®ã¯éžå¸¸ã«å›°é›£ã§ã™ã€‚ ãŸã¨ãˆã°ã€ã€Œã‚ãƒ¼ã€ã“ã®å¤‰æ›´ã¯ã•ã£ãã®ã‚³ãƒŸãƒƒãƒˆã«å«ã‚ã¦ãŠãã¹ãã ã£ãŸãªã€ã¨ã‹ã€‚ Gitã®å ´åˆã‚ã¨ã‹ã‚‰ rebase -i ã§è¡¨ç¤ºã•ã‚Œã‚‹TODOãƒªã‚¹ãƒˆã®é †ç•ªã‚’ä¸¦ã¹æ›¿ãˆãŸã†ãˆã€squashã‚„fixupã‚’æŒ‡å®šã™ã‚Œã°ã€å‰ã®ã‚³ãƒŸãƒƒãƒˆã«èžåˆã§ãã¾ã™ãŒã€ã‚³ãƒŸãƒƒãƒˆã®æ™‚ç‚¹ã§fixupå…ˆã®ã‚³ãƒŸãƒƒãƒˆãŒã‚ã‹ã£ã¦ã„ã‚‹å ´åˆã€autosquashã‚’ä½¿ã†ã¨ã€ãã®ä½œæ¥ã‚’åŠè‡ªå‹•åŒ–ã§ãã¾ã™ã€‚ ãŸã¨ãˆã° % git log --oneline master.. 4ce35ee æ–°æ©Ÿèƒ½: ã»ã’ã»ã’ã‚’è¿½åŠ 40a7ef4 ã»ã’ã»ã’æ©Ÿèƒ½è¿½åŠ ã®ãŸã‚ã®æº–å‚™ ã®ã‚ˆã†ã«2ã¤ã®ã‚³ãƒŸãƒƒãƒˆãŒã‚ã£ãŸå ´åˆã€ãƒžãƒ¼ã‚¸å‰ã«ãƒ¬ãƒ“ãƒ¥ãƒ¼ã—ãŸã¨ã“ã‚ã€40a7e
yanagikouta 2016/04/15
fixup!!

git
ãƒªãƒ³ã‚¯
git rebase -i ã®ãŸã‚ã® rebase.autosquash ã‚ªãƒ—ã‚·ãƒ§ãƒ³ - Qiita
rebase.autosquash ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã£ã¦ä½•ï¼Ÿ git rebase -i hoge ã‚’å®Ÿè¡Œã—ãŸæ™‚ã«ã€ç‰¹å®šã®commitãŒæŒ‡å®šã—ãŸcommitã®å¾Œã«ç§»å‹•ã—ãŸçŠ¶æ…‹ã§ç·¨é›†ç”¨ãƒ†ã‚ã‚¹ãƒˆã‚’é–‹ãã‚ªãƒ—ã‚·ãƒ§ãƒ³ ã‚³ãƒŸãƒƒãƒˆãƒã‚°ãŒfoo fooã®commitãŒå˜åœ¨ã™ã‚‹å ´åˆã€squash! foo foo ã¨ã„ã†ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã§commitã‚’è¡Œã†ã¨ã€git rebase -i hoge ã‚’è¡Œã£ãŸæ™‚ã«ã€ä¸‹è¨˜ã®çŠ¶æ…‹ã§ç·¨é›†ç”¨ãƒ†ã‚ã‚¹ãƒˆãŒé–‹ã
yanagikouta 2016/04/15
commitã‚’ç¶ºéº—ã«ä¿ã¨ã†

git

é–‹ç™º
ãƒªãƒ³ã‚¯
ã“ã‚ããªã„ Git
8. ã‚³ãƒŸãƒƒãƒˆã«å…¥ã£ã¦ã‚‹æƒ…å ± ãƒªãƒ“ã‚¸ãƒ§ãƒ³ (SHA-1 ãƒãƒƒã‚·ãƒ¥) ä¾‹: 23cdd334e6e251336ca7dd34e0f6e3ea08b5d0db Author (ã‚³ãƒŸãƒƒãƒˆã‚’ä½œæˆã—ãŸäºº) ä¾‹: ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«ãƒ‘ãƒƒãƒã‚’é€ã£ãŸäºº Committer (ã‚³ãƒŸãƒƒãƒˆã‚’é©ç”¨ã—ãŸäºº) ä¾‹: å—ã‘å–ã£ãŸãƒ‘ãƒƒãƒã‚’å–ã‚Šè¾¼ã‚“ã äºº ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¹ãƒŠãƒƒãƒ—ã‚·ãƒ§ãƒƒãƒˆ (tree) ã‚³ãƒŸãƒƒãƒˆã§å¤‰æ›´ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å«ã‚€ãƒ„ãƒªãƒ¼ï¼ˆèª¬æ˜Žã¯çœç•¥ï¼‰ 1ã¤å‰ã®ã‚³ãƒŸãƒƒãƒˆã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³ ä¾‹: 4717e3cf182610e9e82940ac45abb0d422a76d77 9. ã‚³ãƒŸãƒƒãƒˆã«å…¥ã£ã¦ã‚‹æƒ…å ± ãƒªãƒ“ã‚¸ãƒ§ãƒ³ (SHA-1 ãƒãƒƒã‚·ãƒ¥) ä¾‹: 23cdd334e6e251336ca7dd34e0f6e3ea08b5d0db Author (ã‚³ãƒŸãƒƒãƒˆã‚’ä½œæˆã—ãŸäºº) ä¾‹: ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã«ãƒ‘ãƒƒãƒã‚’é€ã£ãŸäºº Co
yanagikouta 2016/01/06
ã‚ã‹ã‚Šã‚„ã™ã™ãŽã¦ç¬‘ã£ãŸ

git
ãƒªãƒ³ã‚¯
Gitå…¥é–€ï¼šGitåˆå¦ç¿’è€…ã®ãŸã‚ã®åŠ¹çŽ‡çš„ãªå¦ç¿’æ–¹æ³•ã‚’è€ƒãˆã¦ã¿ãŸ
English
yanagikouta 2015/12/16
ç¤¾ä¼šã«å‡ºã‚‹å‰ã«çŸ¥ã£ã¦ãŠããŸã„ã‹ã‚‚

git

å¦ç¿’

è³‡æ–™
ãƒªãƒ³ã‚¯
ãƒ¬ãƒ“ãƒ¥ãƒ¼ã—ã‚„ã™ã„ã‚³ãƒŸãƒƒãƒˆå±¥æ´ã§ãƒã‚°å‰Šæ¸› - Money Forward Developers Blog
ã“ã‚“ã«ã¡ã¯ã€‚ ã‚¢ã‚°ãƒªã‚²ãƒ¼ã‚·ãƒ§ãƒ³é–‹ç™ºæ‹…å½“ã®ä¸å·ã§ã™ã€‚ ä»Šå›žã¯ã€ã¿ã‚“ãªãŒå¤§å¥½ããªæ§‹æˆç®¡ç†ãƒ„ãƒ¼ãƒ«ã€ŒGitã€ã«ã¤ã„ã¦è©±ã—ãŸã„ã¨æ€ã„ã¾ã™ã€‚ ç§ã¯ Git ã‚’ä½¿ã„å§‹ã‚ã¦ã‹ã‚‰ã€ãƒã‚°ã®ç™ºç”Ÿæ•°ãŒæ¿€æ¸›ã—ã¾ã—ãŸã€‚ Git ã‚’ä½¿ã£ãŸã¨ã‚ã‚‹æ‰‹æ³•ã«ã‚ˆã£ã¦ãƒ¬ãƒ“ãƒ¥ãƒ¼ãŒå……å®Ÿã—ã€ãƒã‚°ã®å°‘ãªã„ã‚³ãƒ¼ãƒ‰ã‚’æ›¸ãã‚ˆã†ã«ãªã£ãŸã¨è€ƒãˆã¦ã„ã¾ã™ã€‚ ã§ã¯ã€ä»Šå›žã¯ãã®æ‰‹æ³•ã«ã¤ã„ã¦ç´¹ä»‹ã—ãŸã„ã¨æ€ã„ã¾ã™ã€‚ â€» æœ¬ç¨¿ã¯ Git ä»¥å¤–ã®ç¬¬ä¸‰ä¸–ä»£æ§‹æˆç®¡ç†ãƒ„ãƒ¼ãƒ«ï¼ˆHgã€Bzr ãªã©ï¼‰ã«ã‚‚é©ç”¨ã™ã‚‹ã‹ã¨æ€ã„ã¾ã™ãŒã€Git ã®ç”¨èªžã¨ã‚³ãƒžãƒ³ãƒ‰ã‚’ä½¿ã£ã¦ç´¹ä»‹ã—ã¦ã„ããŸã‚ Git ã®åŸºæœ¬çŸ¥è˜ãŒå¿…è¦ã¨ãªã‚Šã¾ã™ã€‚ã”äº†æ‰¿ãã ã•ã„ã€‚ ãƒ¬ãƒ“ãƒ¥ãƒ¼ã—ã‚„ã™ã„ã‚³ãƒŸãƒƒãƒˆå±¥æ´ã¨ã€é–‹ç™ºã®æµã‚Œã§è‡ªç„¶ã«ã§ãã‚‹ã‚³ãƒŸãƒƒãƒˆå±¥æ´ã®ä¹–é›¢ ä»¥ä¸‹ã®ã‚ˆã†ãªã‚³ãƒŸãƒƒãƒˆå±¥æ´ãŒã‚ã‚‹ã¨ã—ã¾ã™ã€‚ 1. wip: ä»•æ§˜å¤‰æ›´â—‹â—‹ã‚’è¡Œã„å§‹ã‚ãŸ 2. wip: ä»•æ§˜å¤‰æ›´â—‹â—‹ã®ç¶šã 3. wip: ã¡ã‚‡ã£ã¨è¨è¨ˆã‚’å¤‰æ›´ã€ãã‚Œã¨éŽåŽ»ã®ãƒã‚°
yanagikouta 2015/12/02
ã“ã†ã„ã†ã®ã‚‚ä½œæ¥ã®é€²ã‚æ–¹ã¨ã—ã¦è¦šãˆã¦ãŠããŸã„

é–‹ç™º

git

ãƒãƒ¼ãƒ é–‹ç™º
ãƒªãƒ³ã‚¯
SIerã‹ã‚‰Webç³»ã«è»¢è·ã—ã¦åŠå¹´ã€‚è»¢è·å‰ã«ã‚„ã£ã¨ã„ã¦ã‚ˆã‹ã£ãŸãªãã¨æ€ã£ãŸã“ã¨ - suusan2å·ã®æˆ¯ã‚Œ
SIerã‹ã‚‰è‡ªç¤¾Webã‚µãƒ¼ãƒ“ã‚¹ã‚’ã‚„ã£ã¦ã‚‹ä¼šç¤¾ã«è»¢è·ã—ã¦åŠå¹´ãŸã£ãŸã®ã§ã¾ã¨ã‚ã‚‹ã€‚æœ¬å½“ã¯è©¦ç”¨æœŸé–“ãŒçµ‚ã‚ã£ãŸã“ã‚ã«æ›¸ã“ã†ã¨æ€ã£ã¦ã„ãŸã®ã«ã€ã™ã£ã‹ã‚Šå¿˜ã‚Œã¦ã¾ã—ãŸã€‚ã€‚ã€‚ SIerã§ã¯ä»®æƒ³åŒ–ã®ã‚¤ãƒ³ãƒ•ãƒ©ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ã£ã½ã„ã“ã¨ã—ã¦ã¾ã—ãŸã€‚ã„ã¾ã¯Rubyã®ä¼šç¤¾ã§Railsè§¦ã£ãŸã‚ŠReactè§¦ã£ãŸã‚Šã—ã¦ã„ã¾ã™ã€‚ ä»¥ä¸‹ã¯ã€ã“ã‚Œã‚’ã‚„ã£ã¦ãŠãã¨è»¢è·ã®ã¨ãã«æœ‰åˆ©â€¦ã¨ã‹ã„ã†ã‚‚ã®ã§ã¯ãªãã€è»¢è·å¾Œã«ãªã£ã¦ã‚„ã£ã¦ãŠã„ã¦ã‚ˆã‹ã£ãŸãªã¨æ€ã£ãŸã“ã¨ã§ã™ã®ã§æ³¨æ„ã€‚ ã‚„ã£ã¦ãŠã„ã¦ã‚ˆã‹ã£ãŸãªã¨æ€ã£ãŸã“ã¨ Gitã®ä½¿ã„æ–¹ã‚’è¦šãˆã¦ãŠã Gitã¯æ™®é€šã«ä½¿ã„ã¾ã™ã—ã€GitãŒå…¨ãä½¿ãˆãªã„ã¨é–‹ç™ºã«å‚åŠ ã™ã‚‹ã¨ã“ã‚ã‹ã‚‰å¤§å¤‰ã§ã™ã€‚ å½“ç„¶ã€ä»®æƒ³åŒ–ã®ã‚¤ãƒ³ãƒ•ãƒ©ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ãªã‚“ã¦ã‚„ã£ã¦ãŸã®ã§Gitãªã‚“ã¦å…¨ç„¶ä»•äº‹ã§ã¯è§¦ã£ã¦ã¾ã›ã‚“ã§ã—ãŸãŒã€è¶£å‘³ã®è‡ªåˆ†ä¸€äººã®é–‹ç™ºã§ã‚‚æ›´æ–°ã¯GitHubã§ãƒ—ãƒ«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ã‚Šã‚»ãƒ«ãƒ•ãƒžãƒ¼ã‚¸ã™ã‚‹æ„Ÿã˜ã«ã—ã¦æ…£ã‚Œã‚‹ã‚ˆã†ã«ã—ã¦ã¾ã—ãŸã€‚ ä»¥ä¸‹ã®æœ¬ã§ã¯ã€ãªã‚“
yanagikouta 2015/11/10
ä¸€æ˜¨æ—¥ã®ãƒ—ãƒ¬ã‚¼ãƒ³ã§ã¯SIerã«ã¯ãªã‚ŠãŸãã‚ã‚Šã¾ã›ã‚“ï¼ ã£ã¦è¨€ã„å¼µã£ãŸã‹ã‚‰ã€è‡ªåˆ†ã«ã¨ã£ã¦ã¯ä»Šã‚„ã‚‹ã¹ãäº‹ã‹ãƒ¼

webã‚µãƒ¼ãƒ“ã‚¹

antiSIer

git
ãƒªãƒ³ã‚¯
gitã¨ãƒ—ãƒ«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«é–¢ã—ã¦æ€ã†ã“ã¨ã¾ã¨ã‚ - Qiita
â€»ã“ã®è¨˜äº‹ã¯å…ƒã€…ã€ŒGitã®ã“ã‚Œã‚„ã‚ã¦ï¼ãƒªã‚¹ãƒˆã€ã¨ã—ã¦2015å¹´11æœˆã«æŠ•ç¨¿ã—ãŸã‚‚ã®ã‚’æ”¹è¨‚ã—ãŸã‚‚ã®ã§ã™ã€‚ ã“ã®è¨˜äº‹ã«ã¤ã„ã¦ ç§ãŒå€‹äººçš„ã«gitã¨ãƒ—ãƒ«ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«ã¤ã„ã¦ã€ã€Œã“ã†ã—ã¦æ¬²ã—ã„ã€ã¨ã‹ã€Œã“ã‚Œã¯ã‚„ã‚‰ãªã„ã§ï¼ï¼ã€ã¨ã‹æ€ã£ã¦ã„ã‚‹ã“ã¨ã‚’ã¾ã¨ã‚ãŸã‚‚ã®ã§ã™ã€‚ å…ƒã€…ã¯2015å¹´ã«ç§ãŒã‚³ãƒ¼ãƒ‰ãƒ¬ãƒ“ãƒ¥ãƒ¼ã‚’ã—ã¦ã‚‹æ™‚ã«æ°—ã«ãªã£ãŸã“ã¨ã‚’ã€ã‚ã¾ã‚ŠæŽ¨æ•²ã‚‚ã›ãšæ€ã†ãŒã¾ã¾ã«æ›¸ã„ãŸè¨˜äº‹ã§ã—ãŸã€‚ä»Šæ”¹ã‚ã¦èªã¿è¿”ã™ã¨ç¨šæ‹™ãªæ–‡ç« ãªã®ã¨ã€ä»–ã«æ€ã†ã¨ã“ã‚ã¨ãŒã‚ã£ãŸã‚Šã—ãŸã®ã§ã€æ”¹ã‚ã¦æ›¸ãç›´ã—ã¾ã—ãŸã€‚ã„ã„ãè²°ã£ã¦ã‚‹ã®ã«æ›¸ãç›´ã™ã®ã«è‹¥å¹²å¾Œã‚ã‚ãŸã•ãŒã‚ã‚‹ã®ã§ã™ãŒã€ã‚ˆã‚Šã„ã„å†…å®¹ã«ã§ãã‚Œã°ã¨æ€ã„ã¾ã™ã€‚ ã‚³ãƒŸãƒƒãƒˆãƒã‚°ãŒãã‚Œã„ã ã¨ãƒ¬ãƒ“ãƒ¥ãƒ¼ã—ã‚„ã™ã„ ä¸€äººã§é–‹ç™ºã™ã‚‹ã¨ãã¯gitä½¿ã£ã¦ã¦ã‚‚ãƒ–ãƒ©ãƒ³ãƒåˆ‡ã‚‰ãªã„ã—ã€ãƒ—ãƒ«ãƒªã‚¯ã‚‚ã ã•ãªã„ã—ã§ã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚‚"First Commit"ã®æ¬¡ãŒ"Second Commit"ã¨ã‹ã§ã‚‚æ”¯éšœã¯ãªã„ã§ã™ã€‚ã—ã‹ã—ã€ãƒãƒ¼ãƒ ã§é–‹ç™ºã™
yanagikouta 2015/11/10
ãã®3ã¯ã²ã§ã‡ãªâ€¦ç¬‘

git

é–‹ç™º

ãƒ—ãƒã‚°ãƒ©ãƒŸãƒ³ã‚°
ãƒªãƒ³ã‚¯
Î¼â€™sã¨å¦ã¶ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ å…¥é–€ â€“ ãƒ©ãƒ–ãƒ©ã‚¤ãƒ–ï¼ã§å¦ã¶ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢é–‹ç™ºå…¥é–€
ã‚‚Gitâ€loveâ€ã§æŽ¥è¿‘ä¸ï¼ Gitã«ã‚ˆã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã®åŸºç¤Žã‚’å¦ã³ã¾ã™ã€‚ ã“ã¨ã‚Šã€Œã¿ã‚“ãªã§æŒã‚’ä½œã‚‹ï¼Ÿã€ ç©‚ä¹ƒæžœã€Œãã†ï¼9äººã§1ã¤ã®æŒã‚’ä½œã‚‹ã‚“ã ã‚ˆï¼ã€ æµ·æœªã€Œã‚ã®ãƒ»ãƒ»ãƒ»ãã†ã„ã†ä¼ç”»ã€ã“ã‚Œã¾ã§ã«ã‚‚ä½•å›žã‹ã€ å‡›ã€Œæ—¢å‡ºã‚‚ç”šã ã—ã„ã«ã‚ƒã€ ç©‚ä¹ƒæžœã€Œã„ã„ã®ã£ï¼ãªã‚“ã‹å…±åŒä½œæ¥ã‚’ã—ãªãã‚ƒã„ã‘ãªã„ã£ã¦å£°ãŒèžã“ãˆã‚‹ã®ï¼ã€ ã«ã“ã€Œã¡ã‚‡ã£ã¨ï¼ç©‚ä¹ƒæžœã¾ã§å¸Œã¿ãŸã„ãªã“ã¨è¨€ã„å‡ºã—ãŸã‚ã‚ˆï¼ï¼Ÿã€ ç©‚ä¹ƒæžœã€Œã¨ã«ã‹ãï¼å…¨å“¡ã«æ‹…å½“ç®‡æ‰€å‰²ã‚ŠæŒ¯ã‚‹ã‹ã‚‰ã€è€ƒãˆã¦ãã¦ã£ï¼ã€ ç©‚ä¹ƒæžœã€Œã§ã€æ¯Žæ—¥ã¿ã‚“ãªã§è¦‹ã›åˆã£ã¦èª¿æ•´ï¼ã£ã¦ã“ã¨ã§ã€ã‚ˆã‚ã—ãï¼ã€ ãŸã ã„ã¾é€£è¼‰ä¸ï¼
yanagikouta 2015/10/28
git
ãƒªãƒ³ã‚¯
1