橋本商会 » æ–‡å—å˜ä½ã§git diffè¡Œå˜ä½ã§ã¯ãªãæ–‡å—å˜ä½ã§diffを見ãŸã„。 –word-diff-regexオプションを使ㆠ英語ãªã©ã®ç©ºç™½æ–‡å—ã§å˜èªžãŒåˆ†ã‘られる言語ã¯ã€git diff –word-diffを使ãˆã°ã„ã„。 日本語ãªã‚‰ã€git diffã«â€“word-diff-regexオプションをã¤ã‘ã‚Œã°ã„ã„。 % git diff --word-diff-regex="\w+" ã“ã†ã™ã‚‹ã¨æ—¥æœ¬èªžã§ã‚‚化ã‘ãšã«æ¯”較ã§ããŸã€‚ã§ã‚‚ã€ãŸã¾ã«å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œãªã„è¡ŒãŒã§ã‚‹ã€‚ 毎回–word-diff-regexオプションを付ã‘ã‚‹ã®ãŒé¢å€’ãªã®ã§ã€é©å½“ãªãƒ‘スã®é€šã£ã¦ã„ã‚‹å ´æ‰€ã«git-chardiffã¨ã„ã†ã‚·ã‚§ãƒ«ã‚¹ã‚¯ãƒªãƒ—トを作ã£ã¦å®Ÿè¡Œæ¨©é™ä»˜ã‘ãŸã€‚ ~/bin/git-chardiff #!/bin/sh git diff --word-diff-regex="\w+" $@ gitã¯é ã«ã€Œgit-ã€ã¨ä»˜ã実行å¯èƒ½ã‚³ãƒžãƒ³ãƒ‰ã‚’サブコマンドã¨ã—ã¦
執ç†ãƒ»ç·¨é›†ã®ãŸã‚ã®Git（GitHub）ワークフãƒãƒ¼ã‚’考ãˆã¦ã¿ãŸ
Oh, shit, git!
[日本語訳]A successful Git branching model - Qiita![[日本語訳]A successful Git branching model - Qiita](https://cdn-ak-scissors.b.st-hatena.com/image/square/e399842c15121ec41676c7bca0fc24a062219eae/height=288;version=1;width=512/https%3A%2F%2Fqiita-user-contents.imgix.net%2Fhttps%253A%252F%252Fcdn.qiita.com%252Fassets%252Fpublic%252Farticle-ogp-background-412672c5f0600ab9a64263b751f1bc81.png%3Fixlib%3Drb-4.0.0%26w%3D1200%26mark64%3DaHR0cHM6Ly9xaWl0YS11c2VyLWNvbnRlbnRzLmltZ2l4Lm5ldC9-dGV4dD9peGxpYj1yYi00LjAuMCZ3PTk3MiZoPTM3OCZ0eHQ9JTVCJUU2JTk3JUE1JUU2JTlDJUFDJUU4JUFBJTlFJUU4JUE4JUIzJTVEQSUyMHN1Y2Nlc3NmdWwlMjBHaXQlMjBicmFuY2hpbmclMjBtb2RlbCZ0eHQtYWxpZ249bGVmdCUyQ3RvcCZ0eHQtY29sb3I9JTIzMjEyMTIxJnR4dC1mb250PUhpcmFnaW5vJTIwU2FucyUyMFc2JnR4dC1zaXplPTU2JnM9Yjg4ZjBiNmI4Yzk2Mjc3NDA3ZDdmNWFhMjkyMzFlZmI%26mark-x%3D142%26mark-y%3D57%26blend64%3DaHR0cHM6Ly9xaWl0YS11c2VyLWNvbnRlbnRzLmltZ2l4Lm5ldC9-dGV4dD9peGxpYj1yYi00LjAuMCZoPTc2Jnc9NzcwJnR4dD0lNDBob21ob200NCZ0eHQtY29sb3I9JTIzMjEyMTIxJnR4dC1mb250PUhpcmFnaW5vJTIwU2FucyUyMFc2JnR4dC1zaXplPTM2JnR4dC1hbGlnbj1sZWZ0JTJDdG9wJnM9NjAwNzZlYWFkZTU5ZTVhNTBiYmE1Yjg0YTU0ZDBlY2Y%26blend-x%3D142%26blend-y%3D486%26blend-mode%3Dnormal%26s%3Dbb4b6a0179b37c71b0f8befd10a9fe65)
ã„ã¾ã•ã‚‰ GitBucket ã‚’ã€3分ã§å‹•ã‹ã™ç’°å¢ƒä½œã‚Šï¼ˆwindowsã‚‚okã ãœï¼‰ - Qiita
SourceTreeã‹ã‚‰å§‹ã‚ã‚‹Git - Qiita
{{#tags}}- {{label}}
{{/tags}}