git svnã¨gitを併用ã™ã‚‹æ–¹æ³•ã®ãƒ¡ãƒ¢ - Hello, world! - s21ggit svnを以下ã®ã‚ˆã†ãªæ§‹æˆã§ä½¿ã£ã¦ã„ãŸæ™‚ã«ã€git svnã®ãƒªãƒ¢ãƒ¼ãƒˆãƒˆãƒ©ãƒƒã‚ングブランãƒã®pointerãŒtrunkã«ä»£ã‚ã£ã¦ã—ã¾ã„ã€ã„ã¤ã®ã¾ã«ã‹ãƒ–ランãƒã«commitã—ãŸã¤ã‚‚ã‚Šã®ã‚‚ã®ãŒtrunkã«commitã•ã‚Œã‚‹ã¨ã„ã†äº‹ãŒã‚ã‚Šã€å›°ã‚Šã¾ã—ãŸã€‚ gitã‹ã‚‰.gitã«pushã—ãŸã‚‚ã®ã‚’ git-svnã‹ã‚‰pullã—ãŸã‚¿ã‚¤ãƒŸãƒ³ã‚°ã§ç™ºç”Ÿã™ã‚‹ã‚ˆã†ã§ã™ã€‚ 解決ç–ã¨ã—ã¦ã¯ã€git-svnã§git pullã‚’ã›ãšã«ã€ 1 % git fetch remote-name 2 % git merge --no-ff remote-name/branch-name 3 % git svn dcommit
分散ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†å…¥é–€ (イラスト入り) - tcha.org
git-cherry-pickを掘り下ã’ã‚‹ - idesaku blog
{{#tags}}- {{label}}
{{/tags}}