[B! Git] uxoruã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

uxoru id:uxoru

Gitã«é–¢ã™ã‚‹uxoruã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (33)

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

ã€å›³è§£è§£èª¬ã€‘ã“ã‚Œ1æœ¬ã§Gitã‚’ãƒžã‚¹ã‚¿ãƒ¼ã§ãã‚‹ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«ï¼ã€å®Œå…¨ç‰ˆã€‘ - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article? ã¯ã˜ã‚ã« ã“ã‚“ã«ã¡ã¯ã€Watanabe Jin(@Sicut_study)ã§ã™ã€‚ ä»Šå›žã¯è¨˜äº‹1æœ¬ã§åˆå¿ƒè€…ãŒå¿…è¦ãªçŸ¥è˜ã‚’å…¨ã¦å¦ã¹ã‚‹Gitãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«ã‚’ç´¹ä»‹ã—ã¦ã„ãã¾ã™ã€‚ ä¸–ã®ä¸ã«ã¯ãŸãã•ã‚“ã®Gitã«é–¢ã™ã‚‹æ•™æãŒã‚ã‚Šã¾ã™ã€‚ã—ã‹ã—ã€çœŸã«è‰¯ã„ã¨æ€ãˆã‚‹æ•™æã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ ã‚‚ã¡ã‚ã‚“ç§ã‚‚4å¹´å‰ã¯Gitã¨ã„ã†è¨€è‘‰ã‚’çŸ¥ã‚‰ãªã„çŠ¶æ…‹ã‹ã‚‰ã€æ›¸ç±ãªã©ã§å¦ç¿’ã‚’ã—ã¾ã—ãŸã€‚ ã—ã‹ã—ã€æ›¸ç±ã§çŸ¥è˜ã‚’å¾—ãŸã¨ã—ã¦ã‚‚å®Ÿéš›ã«ã‚³ãƒžãƒ³ãƒ‰ã‚’ä½¿ã£ã¦å®Ÿè·µçš„ã«å¦ã‚“ã ã‚ã‘ã§ã¯ãªã‹ã£ãŸã®ã§ã»ã¨ã‚“ã©èº«ã«ãªã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚ ç§ãŒæ€ã†ä¸–ã®ä¸ã«ã‚ã‚‹Gitã®æ•™æã®ã‚¤ã‚±ã¦ãªã„ç‚¹ã¯2ã¤ã§ã™ã€‚ çµå±€ã»ã¨ã‚“ã©ã®
uxoru 2024/10/01
çŒ«ã§ã‚‚ã‚ã‹ã‚‹ãƒ¬ãƒ™ãƒ«ã‹å¦ã‹å¾Œã§èªã‚€

Git
ãƒªãƒ³ã‚¯
ãˆï¼Ÿã¾ã git checkoutã—ã¦ã‚‹ã®ï¼Ÿ
å…¬å¼ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆã«ã¯ä»¥ä¸‹ã®ã‚ˆã†ã«æ›¸ã‹ã‚Œã¦ã„ã¾ã™ã€‚ THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE. å’Œè¨³ï¼šã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯å®Ÿé¨“çš„ã§ã™ã€‚å‹•ä½œãŒå¤‰æ›´ã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ ã“ã®è¨˜äº‹ã®å†…å®¹ã¨é•ã†å ´åˆãŒã‚ã‚‹ã®ã§ã€ã”æ³¨æ„ãã ã•ã„ã€‚ ã“ã®è¨˜äº‹ã¯2024å¹´2æœˆ28æ—¥æ™‚ç‚¹ã®æƒ…å ±ã§ã™ã€‚ ãˆï¼Ÿã¾ã git checkoutã—ã¦ã‚‹ã®ï¼Ÿ git checkoutã¨ã„ãˆã°ã€ãƒ–ãƒ©ãƒ³ãƒã‚’åˆ‡ã‚Šæ›¿ãˆãŸã‚Šã€git addã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…ƒã«æˆ»ã—ãŸã‚Šã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã§ã™ãŒã€ãã‚Œã¯ã‚‚ã†å¤ã„ã§ã™ã€‚ å®Ÿã¯2019å¹´8æœˆãƒªãƒªãƒ¼ã‚¹ã®git 2.23ã‹ã‚‰git switchã¨git restoreãŒè¿½åŠ ã•ã‚Œã¾ã—ãŸã€‚ çŸ¥ã‚‰ãªã‹ã£ãŸäººã‚‚å¤šã„ã®ã§ã¯ãªã„ã§ã—ã‚‡ã†ã‹ï¼Ÿ(æ¥ãšã‹ã—ãªãŒã‚‰ç§ã¯çŸ¥ã‚‰ãªã‹ã£ãŸ...) ã€Œå…ˆè¼©ã€checkoutã£ã¦ãªã‚“ã™ã‹ï¼Ÿã€ã¨å¾Œè¼©ã«èžã‹ã‚Œã‚‹å‰ã«ã€ã“ã®è¨˜äº‹ã‚’èªã‚“ã§git sw
uxoru 2024/02/29
Git
ãƒªãƒ³ã‚¯
Merge vs. Rebase vs. Squash
merge_vs_rebase_vs_squash.md I get asked pretty regularly what my opinion is on merge commits vs rebasing vs squashing. I've typed up this response so many times that I've decided to just put it in a gist so I can reference it whenever it comes up again. I use merge, squash, rebase all situationally. I believe they all have their merits but their usage depends on the context. I think anyone who sa
uxoru 2023/12/02
Git

ã‚ã¨ã§èªã‚€
ãƒªãƒ³ã‚¯
Gitå…¥é–€
å¤§å¦ã‚µãƒ¼ã‚¯ãƒ«ã®ã‚¤ãƒ³ãƒˆãƒç”¨è³‡æ–™ã§ã™ Gitã«å…¥é–€ã—ã¾ã™ resetã‚„revertã‚‚å…¥ã‚ŒãŸã‚‰ã‚ˆã‹ã£ãŸæ°—ãŒã—ã¦ã„ã¾ã™
uxoru 2023/05/17
Git
ãƒªãƒ³ã‚¯
Gitç ”ä¿®ã€MIXI 23æ–°å’æŠ€è¡“ç ”ä¿®ã€‘
23æ–°å’æŠ€è¡“ç ”ä¿®ã§å®Ÿæ–½ã—ãŸGitç ”ä¿®ã®è¬›ç¾©è³‡æ–™ã§ã™ã€‚ å‹•ç”»ï¼šhttps://youtu.be/lWkO8bQ9pSo è³‡æ–™ã®åˆ©ç”¨ã«ã¤ã„ã¦ å…¬é–‹ã—ã¦ã„ã‚‹è³‡æ–™ã¯å‹‰å¼·ä¼šã‚„ä¼æ¥ã®ç ”ä¿®ãªã©ã§è‡ªç”±ã«ã”åˆ©ç”¨é ‚ã„ã¦å¤§ä¸ˆå¤«ã§ã™ãŒã€ä»¥ä¸‹ã®å½¢ã§ã®åˆ©ç”¨ã ã‘ã”é æ…®ãã ã•ã„ã€‚ ãƒ»å—â€¦
uxoru 2023/05/09
Git
ãƒªãƒ³ã‚¯
GitHubãŒSubversionã®ã‚µãƒãƒ¼ãƒˆçµ‚äº†ã‚’ç™ºè¡¨ã€2024å¹´1æœˆ8æ—¥ã¾ã§ã€‚ãã®å¾Œã¯å…¨é¢çš„ã«Gitã«æ³¨åŠ›äºˆå®š
GitHubãŒSubversionã®ã‚µãƒãƒ¼ãƒˆçµ‚äº†ã‚’ç™ºè¡¨ã€2024å¹´1æœˆ8æ—¥ã¾ã§ã€‚ãã®å¾Œã¯å…¨é¢çš„ã«Gitã«æ³¨åŠ›äºˆå®š GitHubã¯ã€GitHub.comã¨GitHub Enterprise Serverã«ãŠã‘ã‚‹Subversionã®ã‚µãƒãƒ¼ãƒˆã‚’ã€ä»Šã‹ã‚‰ç´„1å¹´å¾Œã®2024å¹´1æœˆ8æ—¥ã§å®Œå…¨ã«çµ‚äº†ã™ã‚‹ã“ã¨ã‚’æ˜Žã‚‰ã‹ã«ã—ã¾ã—ãŸã€‚ We'll be removing Subversion support from versions of GitHub Enterprise Server after January 8, 2024. Learn more here: https://t.co/djXDh1QCzh â€” GitHub (@github) January 23, 2023 Subversionã¯ã€ãƒ—ãƒã‚°ãƒ©ãƒ ã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã‚’ç®¡ç†ã™ã‚‹ã‚·ã‚¹ãƒ†ãƒ ã‚‚ã—ãã¯ãã®ä»•çµ„ã¿ã®åå‰ã§ã€ã‚¯ãƒ©ã‚¢ã‚¤ãƒ³ãƒˆï¼ã‚µãƒ¼ãƒåž‹ã®ã‚¢ãƒ¼ã‚
uxoru 2023/01/26
GitHub

Git

subversion
ãƒªãƒ³ã‚¯
Gitã®ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®æ›¸ãæ–¹ï¼ˆ2023å¹´ver.ï¼‰
æœ¬è¨˜äº‹ã®ãƒ¢ãƒãƒ™ãƒ¼ã‚·ãƒ§ãƒ³ ç´„8å¹´å‰ã€Gitã‚’ä½¿ã„å§‹ã‚ãŸã¨ãã«ä»¥ä¸‹ã®è¨˜äº‹ã‚’å…¬é–‹ã—ãŸã¨ã“ã‚ã€æƒ³åƒä»¥ä¸Šã®åå¿œã‚’ã„ãŸã ãã¾ã—ãŸã€‚ å½“æ™‚ã¯Subversionã‹ã‚‰Gitã«ç§»è¡Œã—ã€è©¦è¡ŒéŒ¯èª¤ã‚’ã—ã¦ã„ã‚‹ä¸ã ã£ãŸã“ã¨ã‚‚ã‚ã‚Šã€å¤šãã®åå¿œã‚’ã„ãŸã ã‘ãŸã“ã¨ã¯ãƒ¢ãƒãƒ™ãƒ¼ã‚·ãƒ§ãƒ³ã®ã²ã¨ã¤ã§ã—ãŸã€‚ ãŸã ã€æ™‚ãŒçµŒã¡ã€å½“ç„¶ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ãŒç¾åœ¨ã¯å½“æ™‚ã¨é•ã†æ›¸ãæ–¹ã‚’ã—ã¦ãŠã‚Šã€æ€æƒ³ã¨ã—ã¦å¤‰ã‚ã£ã¦ã„ãªã„éƒ¨åˆ†ã¯ã‚ã‚‹ã‚‚ã®ã®ã€ä»Šã§ã‚‚ã¨ãã©ãLikeã‚’ã„ãŸã ãä¸ã§ã€ã‚¢ãƒƒãƒ—ãƒ‡ãƒ¼ãƒˆã‚’å…¨ãã—ãªã„ã®ã¯èª å®Ÿã˜ã‚ƒãªã„ãªã¨æ„Ÿã˜ã¦ã„ã¾ã—ãŸã€‚ ã¨ã„ã†ã‚ã‘ã§ã€ç¾åœ¨ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚‚æ•°å¹´å¾Œã«ã¯å¤‰ã‚ã£ã¦ã„ã‚‹å¯èƒ½æ€§ãŒé«˜ã„ã§ã™ãŒã€ãã®æ™‚ã€…ã®ã‚¹ãƒŠãƒƒãƒ—ã‚·ãƒ§ãƒƒãƒˆã‚’å…¬é–‹ã™ã‚‹ã“ã¨ã«ã‚‚ä½•ã‚‰ã‹æ„å‘³ãŒã‚ã‚‹ã‹ãªã¨æ€ã„ã€ã€Œä»Šã®åƒ•ã¯ã“ã†ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ›¸ã„ã¦ã„ã‚‹ã‚ˆã€ã¨ã„ã†ã®ã‚’ã¾ã¨ã‚ã¾ã—ãŸã€‚ Gitã‚’ä½¿ã†ç’°å¢ƒ é–‹ç™ºãƒ•ãƒãƒ¼ã‚„ãƒ›ã‚¹ãƒ†ã‚£ãƒ³ã‚°ã‚µãƒ¼ãƒ“ã‚¹ã”ã¨ã®UIã®diffã«ã‚ˆã£ã¦ã€æœ€é©ãªãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã¯å¤‰
uxoru 2023/01/05
Git

ã‚ã¨ã§çµ¶å¯¾èªã‚
ãƒªãƒ³ã‚¯
Git ã®æœ€æ–°ã‚¢ãƒƒãƒ—ãƒ‡ãƒ¼ãƒˆã‹ã‚‰è€ƒãˆã‚‹é–‹ç™ºæ‰‹æ³•ã®æ½®æµ
2022.11.15ã«ç™ºè¡¨ã—ãŸå†…å®¹ã«ãªã‚Šã¾ã™ã€‚ https://www.youtube.com/watch?v=ScNN3uGXFd0
uxoru 2022/11/16
Scalarä½¿ã£ã¦ã¿ã‚‹

Git

æ°—ã«ãªã‚‹
ãƒªãƒ³ã‚¯
GitHub - kaityo256/github: GitHubæ¼”ç¿’
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session. Dismiss alert
uxoru 2022/11/13
â€œã“ã‚Œã¯ã€ç†å·¥å¦éƒ¨ã®ä¸‰å¹´å¦éƒ¨ç”Ÿå‘ã‘ã®Git/GitHubã‚’ç”¨ã„ãŸã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢é–‹ç™ºæ¼”ç¿’ã®ãŸã‚ã®è¬›ç¾©ãƒŽãƒ¼ãƒˆã§ã‚ã‚‹ã€‚â€

Git

GitHub

ã‚¬ã‚¤ãƒ‰ãƒ©ã‚¤ãƒ³

ä½•åº¦ã‚‚èªã¿ãŸã„
ãƒªãƒ³ã‚¯
git checkout ã®ä»£æ›¿ã¨ã—ã¦ãƒªãƒªãƒ¼ã‚¹ã•ã‚ŒãŸ git switch ã¨ git restore - kakakakakku blog
2019å¹´8æœˆã«ãƒªãƒªãƒ¼ã‚¹ã•ã‚ŒãŸ Git 2.23 ã‹ã‚‰ï¼ŒExperimentalï¼ˆå®Ÿé¨“çš„æ©Ÿèƒ½ï¼‰ã¨ã—ã¦æ–°ã‚³ãƒžãƒ³ãƒ‰ git switch ã¨ git restore ãŒä½¿ãˆã‚‹ï¼Žä»Šã¾ã§ãšã£ã¨ä½¿ã£ã¦ããŸ git checkout ã¯æ©Ÿèƒ½ãŒå¤šã™ãŽãŸãŸã‚ï¼Œæ©Ÿèƒ½ã‚’åˆ†å‰²ã— git checkout ã®ä»£æ›¿ã¨ã—ã¦ãƒªãƒªãƒ¼ã‚¹ã•ã‚ŒãŸï¼Žå€‹äººçš„ã«ãƒªãƒªãƒ¼ã‚¹ã•ã‚Œã¦ã‹ã‚‰ï¼Œã§ãã‚‹é™ã‚Š git switch ã¨ git restore ã‚’ä½¿ã†ã‚ˆã†ã«ã—ã¦ã‚‹ã‘ã©ï¼Œã¾ã ç„¡æ„è˜ã« git checkout ã‚’ä½¿ã£ã¦ã—ã¾ã†ã“ã¨ã‚‚ã‚ã‚‹ï¼Žæœ€è¿‘ git switch ã‚’æ•™ãˆã‚‹æ©Ÿä¼šãŒã‚ã£ãŸãŸã‚ï¼Œãƒ–ãƒã‚°ã«ã¾ã¨ã‚ã¦ãŠãï¼Ž github.blog ãªãŠï¼Œä»¥ä¸‹ã®æ¤œè¨¼ã¯ Git 2.26.0 ã‚’ä½¿ã£ãŸï¼Ž $ git --version git version 2.26.0 1. git switch ã‚’ä½¿ã† git switch ã‚’ä½¿ã£ã¦ã€Œãƒ–ãƒ©ãƒ³ãƒæ“ä½œã€
uxoru 2022/08/14
Git
ãƒªãƒ³ã‚¯
https://twitter.com/developer_quant/status/1544666710506348544
uxoru 2022/07/07
Git

Microsoft

ã‚ã¨ã§èªã‚€

å¦ç¿’
ãƒªãƒ³ã‚¯
What Comes After Git
Git was born from the collaboration probl ems in the Linux kernel. Nearly a decade later, new probl ems arose when Kubernetes (the operating system of the cloud) brought open-source collaboration to a new level. I saw the pain points of git (and GitHub) firsthand working on Kubernetes open-source. Will a new version control system (or something that solves similar probl ems) spring up? Some ideas on
uxoru 2022/07/06
å†…éƒ¨ã¯Gitã®ã¾ã¾ã§ã‚‚ã„ã„ã‹ã‚‰ã€é–‹ç™ºè€…ä»¥å¤–ã®äººã§ã€ä¾‹ãˆã°å°èª¬å®¶ã§ã‚‚æ¯”è¼ƒçš„ã‚ã‹ã‚Šã‚„ã™ãä½¿ãˆã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ãƒ„ãƒ¼ãƒ«ãŒæ¬²ã—ã„ãã€‚

Git
ãƒªãƒ³ã‚¯
Oh Shit, Git!?!
Gitã£ã¦é›£ã—ã„ã€‚ç°¡å˜ã«ãã¡ã‚ƒãã¡ã‚ƒã®çŠ¶æ…‹ã«ãªã£ã¡ã‚ƒã†ã—ã€å¤±æ•—ã‚’ç›´ã™æ–¹æ³•ã‚’çŸ¥ã‚ã†ã¨ã—ãŸã¨ã“ã‚ã§ã¾ã˜ããä¸å¯èƒ½ã€‚Gitã®ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒ†ãƒ¼ã‚·ãƒ§ãƒ³ã£ã¦åµã¨ãƒ‹ãƒ¯ãƒˆãƒªã®å•é¡Œã¿ãŸã„ãªã¨ã“ã‚ãŒã‚ã£ã¦ã€ãƒãƒžã‚Šã‹ã‚‰æŠœã‘å‡ºã™ãŸã‚ã«çŸ¥ã£ã¦ãªã„ã¨ã„ã‘ãªã„äº‹æŸ„ã®åå‰ã‚’ã‚ã‚‰ã‹ã˜ã‚çŸ¥ã£ã¦ã„ãªã„ã¨ã€ã©ã†ã‚„ã£ã¦å•é¡Œã‚’è§£æ±ºã—ãŸã‚‰ã„ã„ã®ã‹æ¤œç´¢ã™ã‚‹ã“ã¨ã™ã‚‰ã§ããªã„ã‚“ã ã‚ˆãã€‚ ã ã‹ã‚‰ã“ã“ã«ã€ç§ãŒéé‡ã—ãŸã“ã¨ã®ã‚ã‚‹ã‚ˆã‚ã—ããªã„çŠ¶æ³ã‹ã‚‰ã€æœ€çµ‚çš„ã«ã©ã†ã‚„ã£ã¦æŠœã‘å‡ºã—ãŸã‹ã‚’ãƒ•ãƒ„ãƒ¼ã®æ—¥æœ¬èªžã§æ›¸ã„ã¦ã„ã“ã†ã¨æ€ã†ã€‚ ãã£ããƒ¼ã€è¶…çµ¶ã‚„ã‚‰ã‹ã—ãŸã€‚ãŠé¡˜ã„ã€Gitã«ã¯é”æ³•ã®ã‚¿ã‚¤ãƒ ãƒžã‚·ãƒ³ãŒã‚ã‚‹ã£ã¦è¨€ã£ã¦ï¼Ÿ git reflog # ã“ã†ã™ã‚‹ã¨ã€Gitã§ã‚„ã£ãŸã“ã¨ãŒã™ã¹ã¦ã®ãƒ–ãƒ©ãƒ³ãƒã«æ¸¡ã£ã¦å…¨éƒ¨è¦‹ãˆã‚‹ã‚ˆï¼ # ã©ã®ãƒ–ãƒ©ãƒ³ãƒã«ã‚‚ HEAD@{index} ã£ã¦ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ãŒã‚ã‚‹ã¯ãšã ã‹ã‚‰ # ã‚„ã‚‰ã‹ã™å‰ã®ã‚„ã¤ã‚’è¦‹ã¤ã‘ã¦ git reset HEAD@{index
uxoru 2022/06/04
ãªã‚“ã ã‹ã€Pythonç’°å¢ƒæ§‹ç¯‰è¨˜äº‹ãŒå®šæœŸçš„ã«ãƒ–ã‚¯ãƒžã•ã‚Œã‚‹ã®ã¨åŒã˜ã§ã€Git ãƒªãƒã‚¸ãƒˆãƒªè¨‚æ£ã‚³ãƒžãƒ³ãƒ‰ãŒå®šæœŸçš„ã«ãƒ–ã‚¯ãƒžã•ã‚Œã‚‹ã®ã€Gitãã®ã‚‚ã®ã«èª²é¡ŒãŒã‚ã‚‹æ°—ãŒã™ã‚‹ä»Šæ—¥ã“ã®é ƒã§ã™ã€‚

Git

è¨€ã„ãŸã„ã ã‘
ãƒªãƒ³ã‚¯
Git ã®ä»•çµ„ã¿ (1) - ã“ã›ãã®æŠ€è¡“æ—¥è¨˜
ç›®æ¬¡ ã¯ã˜ã‚ã« Git ã‚’ä½¿ã£ãŸã“ã¨ãŒãªã„æ–¹ã¸ ç”Ÿã®ãƒ‡ãƒ¼ã‚¿ãŒè¦‹ãŸã„æ–¹ã¸ Git ã®å…¨ä½“åƒ .git ã®ä¸èº« Git ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ 4ç¨®é¡žã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆ ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ã®ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ å¤§ããªãƒ„ãƒªãƒ¼ Git ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã® ID ã¨ ä¸èº« ãƒãƒƒã‚·ãƒ¥é–¢æ•° SHA1 ã®ç°¡å˜ãªèª¬æ˜Ž tree ã¨ blob ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆ tree ã¨ blob ã®å‚ç…§é–¢ä¿‚ ãƒ«ãƒ¼ãƒˆãƒ„ãƒªãƒ¼ã® ID ã§ãƒ„ãƒªãƒ¼å…¨ä½“ã‚’è˜åˆ¥ã™ã‚‹ commit ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆ ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ã¨ãƒ–ãƒ©ãƒ³ãƒ ãƒ–ãƒ©ãƒ³ãƒ ãƒ–ãƒ©ãƒ³ãƒå…ˆé ã‚’æŒ‡ã™ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ HEAD ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ detached HEAD 2ç¨®é¡žã®ã‚¿ã‚° ä¸€æ™‚å¾…é¿ (stash) ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ ã‚ãƒ£ãƒƒã‚·ãƒ¥ã¨ã—ã¦ã®å½¹å‰² ãƒžãƒ¼ã‚¸ Fast-Forward ãƒžãƒ¼ã‚¸ non Fast-Forward ãƒžãƒ¼ã‚¸ rebase reset 2ç¨®é¡žã®ãƒ–ãƒ©ãƒ³ãƒ å„ãƒªãƒã‚¸ãƒˆãƒªãŒè‡ªåˆ†ã®ãƒ–ãƒ©ãƒ³ãƒã‚’
uxoru 2022/05/03
Git
ãƒªãƒ³ã‚¯
å€‹äººçš„ã«ã‚ˆãä½¿ã†Gitã‚¨ã‚¤ãƒªã‚¢ã‚¹ã€zshã‚ãƒ¼ãƒã‚¤ãƒ³ãƒ‰ - æœ¬æ—¥ã‚‚ä¹™
æœ€è¿‘ã€ãƒªãƒ¢ãƒ¼ãƒˆãƒ¯ãƒ¼ã‚¯ã¨ã„ã†ã“ã¨ã‚‚ã‚ã‚Šã€ãƒšã‚¢ãƒ—ãƒã¨ã„ã†ã‹AWSã€GCPãªã©ã®æ“ä½œã‚’ã™ã‚‹éš›ã«ä¸€ç·’ã«ç”»é¢ã‚’è¦‹ãªãŒã‚‰ä½œæ¥ã™ã‚‹æ©Ÿä¼šãŒå¤šã„ã§ã™ã€‚è‹¥æ‰‹ã®åŒåƒšãŒã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã‚½ãƒ•ãƒˆã‚’èµ·å‹•ã—ã¦ã‚³ãƒžãƒ³ãƒ‰ã‚’å®Ÿè¡Œã™ã‚‹ã®ã§ã™ãŒã€å‚ã‹ã‚‰è¦‹ã¦ã„ã‚‹ã¨ã‚¨ã‚¤ãƒªã‚¢ã‚¹ãªã‚Šã‚ãƒ¼ãƒã‚¤ãƒ³ãƒ‰ãªã‚Šã‚’ä½¿ãˆã°åŠ¹çŽ‡çš„ã«æ“ä½œã§ãã‚‹ã®ã«ã¨æ€ã†ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ æœ€è¿‘ã¯GUIã§æ“ä½œã™ã‚‹ã“ã¨ãŒå¤šã„ã®ã§ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã‚½ãƒ•ãƒˆã§ã‚³ãƒžãƒ³ãƒ‰æ“ä½œã™ã‚‹ã“ã¨ãŒã‚ã¾ã‚Šãªã„ã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ãŒã€ç§ã¯å°‘ã—å‰ã¾ã§ã¯ï¼ˆã‚¯ãƒ©ã‚¦ãƒ‰ã—ã‹ã§ããªã„ï¼‰IT ã‚¤ãƒ³ãƒ•ãƒ©ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ã‚’ã‚„ã£ã¦ãŠã‚Šã€ãƒ—ãƒã‚°ãƒ©ãƒŸãƒ³ã‚°ã‚ˆã‚Šã‚‚ã‚³ãƒžãƒ³ãƒ‰æ“ä½œã™ã‚‹ã®ãŒåœ§å€’çš„ã«å¤šã‹ã£ãŸãŸã‚ã€ã¡ã‚‡ã£ã¨ã—ãŸã“ã¨ãªã‚‰GUIã‚ˆã‚Šã‚‚ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã§æ“ä½œã™ã‚‹ã“ã¨ãŒå¤šã„ã§ã™ã€‚Windowsã‚’ä½¿ã£ã¦ã„ã¾ã™ãŒ WSL2 + Ubuntu 20.04 LTSã§é–‹ç™ºç’°å¢ƒã‚’æ•´ãˆã¦ã„ã‚‹ãŸã‚ã€æ“ä½œã«ä¸è‡ªç”±ã¯ã»ã¨ã‚“ã©ã—ã¾ã›ã‚“ã€‚ ã“ã®æ‰‹ã®ã‚¨ã‚¤ãƒªã‚¢ã‚¹ã‚„zshãªã©ã®ã‚ªã‚¹ã‚¹ãƒ¡è¨å®šã¯ã‚°ã‚°
uxoru 2022/05/02
Git

æ°—ã«ãªã‚‹
ãƒªãƒ³ã‚¯
Gitã‚’ä½¿ã£ã¦ã‚„ã‚‰ã‹ã—ãŸæ™‚ã€git reflogã•ãˆä½¿ãˆã‚Œã°ã‚ã‚Šã‹ã—ãªã‚“ã¨ã‹ãªã‚‹ - Qiita
ã“ã‚Œã¯ä½• æ–°äººãƒ—ãƒã‚°ãƒ©ãƒžå¿œæ´ã‚¤ãƒ™ãƒ³ãƒˆã®å‚åŠ è¨˜äº‹ã§ã™ã€‚ gitã«ã¯reflogã¨ã„ã†ã‚³ãƒžãƒ³ãƒ‰ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’å¦ã‚“ã§ãŠãã¨ã‚„ã‚‰ã‹ã—ã¡ã‚ƒã£ãŸæ™‚ã‚‚å¤§ä½“ãªã‚“ã¨ã‹ãªã‚‹ã®ã§è¨˜äº‹ã«ã—ã¾ã™ã€‚ git reflogã£ã¦ãªã«ï¼Ÿ git reflogã¨ã¯ã€Gitã§æ“ä½œå±¥æ´ã‚’è¦‹ã‚‹ã“ã¨ãŒã§ãã‚‹ã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚ ä¾‹ãˆã° branch1ã«ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ branch1ã§branch1.txtã‚’ä½œæˆã—ã€ã‚³ãƒŸãƒƒãƒˆã‚’ä½œã‚‹ masterã«ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ ã‚’ã™ã‚‹ã¨ã€ä»¥ä¸‹ã®ã‚ˆã†ãªreflogã«ãªã‚Šã¾ã™ã€‚ $ git reflog 4a4125a (HEAD -> master) HEAD@{0}: checkout: moving from branch1 to master 826a9dc (branch1) HEAD@{1}: commit: Create branch1.txt 4a4125a (HEAD -> mas
uxoru 2022/04/20
Git
ãƒªãƒ³ã‚¯
git commit --fixup ãŒä¾¿åˆ© - Qiita
å§‹ã‚ã« ç§ã¯æœ€è¿‘ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ã«å¾©å¸°ã—ã€ç¾å ´ã§ä¾¿åˆ©ã«æ€ã£ãŸã“ã¨ã‚’ä»Šå¾Œè¨˜äº‹ã«ã§ããŸã‚‰ã¨æ€ã£ã¦ã„ã¾ã™ã€‚ ãã—ã¦1ç™ºç›®ã¯ã€gitã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã«ã¤ã„ã¦è¨˜äº‹ã‚’æ›¸ã„ã¦ã¿ã‚ˆã†ã¨æ€ã„ã¾ã™ã€‚ --fixup ã¯ã©ã‚“ãªæ™‚ã«ä½¿ãˆã‚‹ã®ï¼Ÿ Pull Requestãªã©ã§ã€è»½å¾®ãªæŒ‡æ‘˜ã‚„å¾Œã‹ã‚‰æ°—ä»˜ã„ãŸä¿®æ£ãªã©ã€æœ¬æ¥ã®æ©Ÿèƒ½ã®ã‚³ãƒŸãƒƒãƒˆã¨ã¯åˆ¥ã«ä¿®æ£ã‚³ãƒŸãƒƒãƒˆã‚’æ®‹ã™ã®ã¯å°‘ã—å«Œãªæ™‚ãŒã‚ã‚Šã¾ã™ã‚ˆãã€‚ ã‚³ãƒŸãƒƒãƒˆãŒä¸€ã¤æ‰‹å‰ã§ã‚ã‚Œã°ã€ç›´å‰ã®ã‚³ãƒŸãƒƒãƒˆã‚’ä¿®æ£ã—ã¦ãã‚Œã‚‹ git commit --amendãªã©ã§å¯¾å¿œã§ãã¾ã™ãŒã€3ã¤å‰ã®ã‚³ãƒŸãƒƒãƒˆã«ä¿®æ£ã‚’æ··ãœè¾¼ã¿ãŸã„æ™‚ãªã©ã¯ã€å°‘ã—å¤§å¤‰ã€‚ ãã‚“ãªæ™‚ã«ä¾¿åˆ©ãªã®ãŒã€ã“ã® git commit --fixupã§ã™ã€‚ ä½¿ã„æ–¹ ä¾‹ãˆã°ã€ä¸‹è¨˜ã®ã‚³ãƒŸãƒƒãƒˆã®çŠ¶æ³ã§ã€Fix article pageã®ã‚³ãƒŸãƒƒãƒˆã«å¯¾ã—ã¦ã€è¿½åŠ ã®ä¿®æ£ã‚’ã—ãŸã„ã¨ã™ã‚‹ã€‚ â¯ git log --oneline 1131338365 (HEAD -
uxoru 2022/04/15
Git
ãƒªãƒ³ã‚¯
Gitã®ãŠã™ã™ã‚ã‚¨ã‚¤ãƒªã‚¢ã‚¹5é¸ - è©©ã¨å‰µä½œãƒ»æ€ç´¢ã®ã²ã‚ã°
ç·Šæ€¥æ–°äººã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢å¿œæ´ä¼ç”»ï¼ ã¨ã„ã†ã“ã¨ã§è‡ªåˆ†ãŒ Git ã®ã‚¨ã‚¤ãƒªã‚¢ã‚¹ã¨ã—ã¦è¨å®šã—ã¦ã„ã‚‹ä¾¿åˆ©ã‚³ãƒžãƒ³ãƒ‰ã‚’ç´¹ä»‹ã—ã¦ã„ãã€‚ ç›´å‰ã®ã‚³ãƒŸãƒƒãƒˆã«è¿½ã„ã‚³ãƒŸãƒƒãƒˆã™ã‚‹ (git fixit) git commit --amend --no-edit ã‚‚ã‚ã‚‚ã‚æ•´ãˆã¦ git push ã—ã‚ˆã†ã€ã¨ã™ã‚‹ã¨ã€Œã‚ã£ã¡ã‚‡ã£ã¨ä¿®æ£ã—ãŸã„ã€ã¨ãªã‚‹ã®ã¯ã‚ˆãã‚ã‚‹ã“ã¨ã€‚ãã®éš›ã„ã¡ã„ã¡ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’æ›¸ã„ã¦ rebase ã™ã‚‹ã‹ã¨ã„ã†ã¨ãã‚“ãªé¢å€’ã¯ã¨ã‚ŠãŸããªãã€ä¸€æ’ƒã§çµ‚ã‚ã‚‰ã›ãŸã„ã€‚--no-edit ã§ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ç·¨é›†ã›ãšã« --amend ã§ãã‚‹ã€‚ git fixit ã«è¨å®šã—ã¦ã„ã‚‹ã€‚git commit ã®å¼•æ•°ã‚’ãã®ã¾ã¾å—ã‘ä»˜ã‘ã‚‹ã®ã§ã€git fixit -a ã‚„ git fixit <file> ã®ã‚ˆã†ã«ä½¿ãˆã‚‹ã€‚ ãƒ¡ã‚¤ãƒ³ãƒ–ãƒ©ãƒ³ãƒã«æˆ»ã‚‹ (git com) f() { remote_head=$(git symb
uxoru 2022/04/01
Git

tips

ã‚ã¨ã§èªã‚€
ãƒªãƒ³ã‚¯
Gitãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼è¨è¨ˆã«ã¤ã„ã¦ - é›»é€šç·ç ” ãƒ†ãƒƒã‚¯ãƒ–ãƒã‚°
ã¿ãªã•ã‚“ã“ã‚“ã«ã¡ã¯ã€é›»é€šå›½éš›æƒ…å ±ã‚µãƒ¼ãƒ“ã‚¹ï¼ˆISIDï¼‰Xã‚¤ãƒŽãƒ™ãƒ¼ã‚·ãƒ§ãƒ³æœ¬éƒ¨ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ãƒ‡ã‚¶ã‚¤ãƒ³ã‚»ãƒ³ã‚¿ãƒ¼ã®ä½è—¤å¤ªä¸€ã§ã™ã€‚ ã“ã®è¨˜äº‹ã§ã¯ã€Git ã‚’ä½¿ã£ãŸä»•äº‹ã®ã‚„ã‚Šæ–¹ï¼ˆä»¥é™ã¯ Git ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã¨è¨˜è¼‰ï¼‰ã‚’è¨è¨ˆã™ã‚‹ä¸Šã§ã®æ¤œè¨Žäº‹é …ã‚’èª¬æ˜Žã—ã¾ã™ã€‚ ã“ã‚Œã«ã‚ˆã£ã¦ã€èªè€…ã®çš†ã•ã‚“ãŒGitãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼ã‚’é©åˆ‡ã«å®šç¾©ã§ãã‚‹ã‚ˆã†ã«ãªã‚‹ã“ã¨ã‚’ä¸»ãŸã‚‹ç›®çš„ã¨ã—ã¦ã„ã¾ã™ã€‚ ã¾ãŸã€ç†è€…ã®èƒ½åŠ›ä¸è¶³ã«ã‚ˆã£ã¦è¨˜è¼‰ã—ãã‚Œãªã‹ã£ãŸè€ƒæ…®äº‹é …ã«ã¤ã„ã¦ã€ã‚ˆã‚Šæ·±ã Git ã‚’ä½¿ã„ã“ãªã—ã¦ã„ã‚‹è˜è€…ã‹ã‚‰ã®æŒ‡æ‘˜ã‚’å—ã‘ã‚‹æ©Ÿä¼šã‚’å¾—ã‚‹ã“ã¨ã‚’å‰¯æ¬¡çš„ãªç›®çš„ã¨ã—ã¾ã™ã€‚ ã“ã®è¨˜äº‹ã«ã¯æ›¸ã‹ã‚Œã¦ã„ãªã„ã‚‚ã®ã®ã€æ¤œè¨Žã™ã¹ãäº‹é …ã«ã¤ã„ã¦çŸ¥è¦‹ã®ã‚ã‚‹æ–¹ã¯ãƒ–ãƒã‚°è¨˜äº‹ã‚’æ›¸ã„ãŸã‚Šã€Twitterç‰ã®SNSã§æŒ‡æ‘˜ã—ã¦ãã ã•ã‚‹ã¨ã‚ã‚ŠãŒãŸã„ã§ã™ã€‚ ã¯ã˜ã‚ã« åŸºæœ¬çš„ãªè€ƒãˆæ–¹ Git ãƒ¯ãƒ¼ã‚¯ãƒ•ãƒãƒ¼è¨è¨ˆã«ãŠã‘ã‚‹è€ƒæ…®äº‹é … ãƒãƒ¼ãƒ ã®äººæ•° monorepoã®æ¤œè¨Ž å‚è€ƒæ–‡çŒ® ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆç®¡ç†ãƒ„ãƒ¼ãƒ«ã¨
uxoru 2022/01/24
Git

ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆç®¡ç†

ã‚ã¨ã§èªã‚€
ãƒªãƒ³ã‚¯
Gitã®ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã«è©³ç´°ã‚’æ›¸ãç¿’æ…£ã‚’ã¤ã‘ã¦ã„ã‚‹ - freee Developers Hub
ãŠã¯ã“ã‚“ã°ã‚“ã¡ã¯ã€SREã®æ©‹æœ¬ã§ã™ã€‚ã“ã®è¨˜äº‹ã¯ã€freee Developers Advent Calendar 2021ã®16æ—¥ã‚è¨˜äº‹ã¨ãªã‚Šã¾ã™ã€‚ ã‚ãŸã—ãŒã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ã¨ã—ã¦ä»•äº‹ã‚’ã™ã‚‹ã†ãˆã§ã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’è©³ç´°ã«è¨˜è¿°ã™ã‚‹ç¿’æ…£ã¥ã‘ãŒã‚ã‚Šã€ã“ã®æ©Ÿä¼šã«ãã®å…·ä½“ä¾‹ã‚’ã‚ãˆã¦å…±æœ‰ã—ã¦ã¿ã¾ã™*1ã€‚ä»¥é™ã¯ã¨ãã«æ˜Žç¤ºã—ãªã„é™ã‚Šã€çµ„ç¹”å…¨ä½“ã§ãƒ«ãƒ¼ãƒ«ãŒã‚ã‚‹ã‚ã‘ã§ã¯ãªãã€ã‚ãã¾ã§ã‚ãŸã—ã®ä¸€å€‹äººã®æ„è¦‹ã§ã‚ã‚‹ç‚¹ã«æ³¨æ„ã—ã¦ãã ã•ã„ã€‚ ãƒ¢ãƒãƒ™ãƒ¼ã‚·ãƒ§ãƒ³ freeeã§ã¯ã€Webã‚µãƒ¼ãƒ“ã‚¹ã‹ã‚‰ã‚¤ãƒ³ãƒ•ãƒ©åŸºç›¤ãŠã‚ˆã³ãã®ç›£è¦–è¨å®šã‚’å«ã‚ã¦ã‚³ãƒ¼ãƒ‰ã§ç®¡ç†ã•ã‚Œã¦ãŠã‚Šã€GitHubä¸Šã§ã®Pull Requestã§ã®ãƒ¬ãƒ“ãƒ¥ãƒ¼ã‚’å¿…é ˆã¨ã—ã¦ã„ã¾ã™ã€‚ã‚ãŸã—è‡ªèº«ã¯ç¤¾å†…ã®ç«‹å€™è£œåˆ¶ç•°å‹•åˆ¶åº¦*2ã«ã‚ˆã£ã¦Webé–‹ç™ºã®ç¾å ´ã¨SREã‚’è¡Œãæ¥ã—ã¦ãã¾ã—ãŸãŒã€ã©ã¡ã‚‰ã‚‚ãƒªãƒ•ã‚¡ã‚¯ã‚¿ãƒªãƒ³ã‚°ã®ãŸã‚ã«ã‚¼ãƒãƒ™ãƒ¼ã‚¹ã§ã‚³ãƒ¼ãƒ‰ã‚’æ›¸ãç›´ã™ã“ã¨ã‚‚ã‚ã‚Œã°ã€æ©Ÿèƒ½è¿½åŠ ã‚„ãƒã‚°ãƒ•ã‚£ãƒƒã‚¯ã‚¹ã®ãŸ
uxoru 2021/12/17
Git

ã‚ã¨ã§èªã‚€
ãƒªãƒ³ã‚¯
1 2 æ¬¡ã®ãƒšãƒ¼ã‚¸