GitHub - so-fancy/diff-so-fancy: Good-lookin' diffs. Actually… nah… The best-lookin' diffs. :tada: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
Pretty Diff - Gitã®å·®åˆ†è¡¨ç¤ºã‚’GitHub調ã«ã—ã¦è¦‹ã‚„ã™ãæ•´å½¢
MOONGIFTã¯ã‚ªãƒ¼ãƒ—ンソース・ソフトウェアを紹介ã™ã‚‹ãƒ–ãƒã‚°ã§ã™ã€‚2021å¹´07月16æ—¥ã§æ›´æ–°åœæ¢ã—ã¾ã—㟠ã“ã‚Œã¯Gitを使ã£ã¦ã„ã‚‹ãªã‚‰ãœã²å…¥ã‚Œã¦ãŠããŸã„ツールã§ã™ã€‚ GitHubã®ã‚³ãƒ¼ãƒ‰å·®åˆ†è¡¨ç¤ºã¯ã¨ã¦ã‚‚見やã™ãã¦ã€ä¸€æ—¦ã‚ã‚Œã«æ…£ã‚Œã¦ã—ã¾ã†ã¨ã‚¿ãƒ¼ãƒŸãƒŠãƒ«ã§å‡ºåŠ›ã•ã‚Œã‚‹DiffãŒéžå¸¸ã«è¦‹ã¥ã‚‰ãæ„Ÿã˜ã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚ã—ã‹ã—プãƒã‚¸ã‚§ã‚¯ãƒˆã«ã‚ˆã£ã¦ã¯GitHubを使ãˆãªã„ã¨ã„ã†ã‚±ãƒ¼ã‚¹ã‚‚ã‚ã‚‹ã§ã—ょã†ã€‚ ãã“ã§ä½¿ã£ã¦ã¿ãŸã„ã®ãŒPretty Diffã§ã™ã€‚ä»»æ„ã®Gitリãƒã‚¸ãƒˆãƒªã§GitHub風ã®å·®åˆ†è¡¨ç¤ºã‚’実ç¾ã—ã¦ãれるライブラリã§ã™ã€‚ Pretty Diffã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« インストールã¯npmを使ã£ã¦è¡Œãˆã¾ã™ã€‚ $ npm install -g pretty-diff ã“ã‚Œã§æº–å‚™ã¯å®Œäº†ã§ã™ã€‚ Pretty Diffã®ä½¿ã„æ–¹ 使ã£ã¦ã„ã‚‹Gitリãƒã‚¸ãƒˆãƒªã«ç§»å‹•ã—ã¾ã™ã€‚例ãˆã°æœ€å¾Œã®ã‚³ãƒŸãƒƒãƒˆã¨ã®æ¯”較ã¯ã“ã‚“ãªæ„Ÿã˜ã§ã™ã€‚
difff《ﾃﾞï½ï¾Œï¾Œã€‹
下記ã®æ–‡ç« を比較ã—ã¦ãã ã•ã„。 Betty Botter bought some butter, But, she said, this butter's bitter; If I put it in my batter, It will make my batter bitter, But a bit of better butter Will make my batter better. So she bought a bit of butter Better than her bitter butter, And she put it in her batter, And it made her batter better, So 'twas better Betty Botter Bought a bit of better butter. 下記ã®æ–‡ç« を，ﾋﾋ較ã—ã¦ãã ã¡ã„． Be
æ„外ã¨çŸ¥ã‚‰ã‚Œã¦ã„ãªã„ diff ã«é–¢ã™ã‚‹æ©Ÿèƒ½ - æ°¸é ã«æœªå®Œæˆ
Vim Advent Calendar 2012 ã® 147 日目ã®è¨˜äº‹ã§ã™ã€‚ 137 日目㮠tyru ã•ã‚“ã®è¨˜äº‹ã§ã€Vim ã® diff 機能ã«ã¤ã„ã¦ç´¹ä»‹ãŒã‚ã‚Šã¾ã—ãŸã€‚ã“ã®è¨˜äº‹ã§ã¯ã‚‚ã†å°‘ã—ç´°ã‹ã„ diff ã®æ©Ÿèƒ½ã«ã¤ã„ã¦ç´¹ä»‹ã—ãŸã„ã¨æ€ã„ã¾ã™ã€‚ :diffthis 比較ã—ãŸã„対象ãŒãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ãªã„å ´åˆã€ä¾‹ãˆã°ã€å¤–部ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã‚’ç„¡åãƒãƒƒãƒ•ã‚¡ã«ã‚³ãƒ”ーã—ã¦ããŸå ´åˆã«ã€ãれらã®ãƒãƒƒãƒ•ã‚¡ã® diff を表示ã—ãŸã„ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®å ´åˆã¯ã€:diffsplit ã¯ä½¿ãˆã¾ã›ã‚“。 ã“ã†ã„ã†å ´åˆã¯ :diffthis を使ã„ã¾ã™ã€‚diff ã‚’é©ç”¨ã—ãŸã„ãƒãƒƒãƒ•ã‚¡ã§ãã‚Œãžã‚Œ :diffthis ã‚’ã™ã‚‹ã¨ã€å®Ÿè¡Œã—ãŸãƒãƒƒãƒ•ã‚¡åŒå£«ã®å·®åˆ†ã‚’見るã“ã¨ãŒã§ãã¾ã™ã€‚ ã“れを利用ã—ãŸè¨å®šã«ã€help ã§ç´¹ä»‹ã•ã‚Œã¦ã„ã‚‹ :DiffOrig ãŒã‚ã‚Šã¾ã™ã€‚(:help :DiffOrig) ã“ã‚Œã¯ç¾åœ¨ç·¨é›†ä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¨ã€æœ€å¾Œã«ä¿
git mergetoolã«ã¤ã„ã¦ã‚ã‚Œã“れ試ã—ãŸçµæžœ - Seasons.NET
gitã§ã¯ã€mergetoolã¨ã„ã†ã‚³ãƒžãƒ³ãƒ‰ã‚’打ã¡è¾¼ã‚€ã¨ マージã®ç‚ºã«è¨å®šã•ã‚ŒãŸãƒ„ールãŒç«‹ã¡ä¸ŠãŒã‚Šã¾ã™ã€‚ Macã®å ´åˆã€æ¨™æº–ã§ã¯ã€opendiffãŒé¸ã°ã‚Œã¾ã™ã€‚ ã¨ã¯ã„ãˆä½¿ã„å‹æ‰‹ãŒã‚ˆã„ã‹ã¨ã„ã†ã¨ãã†ã§ã‚‚ãªã„ã®ã§ã›ã£ã‹ãã®æ©Ÿä¼šã§ã™ã‹ã‚‰ 色々試ã—ã¦ã¿ã¾ã—ãŸã€‚ â—Changes.app ã“ã‚Œã¯ã€æ—¥é ƒå·®åˆ†ãƒ„ールã¨ã—ã¦æ„›ç”¨ã—ã¦ã„るシェアウェアã§ã™ãŒã€ 実ã¯ã€Git mergetoolã¨ã—ã¦ã‚‚è¨å®šã§ãã‚‹ãã†ã§ã€‚ ã“ã¡ã‚‰ã®ãƒšãƒ¼ã‚¸ãŒå‚考ã«ãªã‚Šã¾ã™ã€‚ ä»»æ„ã®å ´æ‰€ã«git-chdiff.shã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã—〠chmod +xã§å®Ÿè¡Œæ¨©é™ã‚’ã¤ã‘ã¦ãŠãã¾ã™ã€‚ ファイルã®å†…容ã¯ã€ä»¥ä¸‹ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’記述ã—ã¾ã™ã€‚ #!/bin/sh [ $# -eq 7 ] && /usr/bin/env chdiff --wait "$2" "$5" ãã—ã¦ã€git configコマンドã§ã€å¤–部diffツールã¨ã—ã¦é–¢é€£ã¥ã‘ã¦ãŠã
ソースコードã®æ¯”較/マージツール「P4Merge〠- å¼·ç«ã§é€²ã‚
ç„¡æ–™ã§ä½¿ãˆã‚‹ãƒ“ジュアルãªãƒžãƒ¼ã‚¸ãƒ„ールã€Macå‘ã‘ã®ã‚‚ã®ã¯ä¸ã€…見当ãŸã‚‰ãªã„ã®ã§ã™ãŒã€ŒP4Mergeã€ã¨ã„ã†ã‚¢ãƒ—リã¯ãƒžãƒ«ãƒãƒ—ラットフォーム対応ã§Mac環境ã«ã‚‚対応ã—ã¦ã„ã‚‹ã¿ãŸã„ã§ã™ã€‚ Perforce Visual Merge and Diff Tools http://www.perforce.com/perforce/products/merge.html 自分ãŒDLã—ãŸã¨ãã¯ã€ŒUser Essentialsã€ã®ã€ŒThe Perforce Visual Client (P4V):ã€ã®ãƒªãƒ³ã‚¯ã‹ã‚‰DLã—ã¾ã—ãŸã€‚ DLã—ãŸå¾Œã€dmgファイルをマウントã™ã‚‹ã¨3ã¤ã®ã‚¢ãƒ—リãŒè¡¨ç¤ºã•ã‚Œã¾ã™ãŒçœŸã‚“ä¸ã® p4merge.app ãŒè©²å½“ã®ã‚¢ãƒ—リã§ã™ã€‚ ä½¿ç”¨ç”»é¢ ã¾ãšã¯ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã€‚ 比較画é¢ã€‚èµ¤æž ã§ç¤ºã—ãŸéƒ¨åˆ†ã‚’見ã¦ã‚‚らã†ã¨æ—¥æœ¬èªžã‚‚ã¡ã‚ƒã‚“ã¨è¡¨ç¤ºã•ã‚Œã¦ã„る事ãŒç¢ºèªå‡ºæ¥ã¾ã™ã€‚ é–¢é€£æƒ…å ± Mac/stroyã¨P4M
GNU diff ã®åœ°å‘³ã ã‘ã©ä¾¿åˆ©ãªæ©Ÿèƒ½ - bkブãƒã‚°
GNU diff ã®åœ°å‘³ã ã‘ã©ä¾¿åˆ©ãªæ©Ÿèƒ½ 最近ã«ãªã£ã¦ GNU diff ã®åœ°å‘³ã ã‘ã©ä¾¿åˆ©ãªæ©Ÿèƒ½ã‚’2ã¤çŸ¥ã‚Šã¾ã—ãŸã€‚調ã¹ã¦ã¿ã‚‹ã¨ã€ã„ãšã‚Œã‚‚昔ã‹ã‚‰ã‚る機能ã§ã—ãŸã€‚ --side-by-side ã¯2段組ã§çµæžœã‚’表示ã™ã‚‹ã‚ªãƒ—ションã§ã™ã€‚変更ã•ã‚Œã¦ã„ãªã„行をå«ã‚ã¦2ã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容全体ã¨å¤‰æ›´ç‚¹ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã®ãŒãƒã‚¤ãƒ³ãƒˆã§ã™ã€‚変更ã•ã‚ŒãŸè¡Œã®å‰å¾Œæ•°è¡Œã ã‘ã§ãªãファイル全体をã¾ã¨ã‚ã¦èªã¿ãŸã„ã¨ãã«ä½¿ãˆã¾ã™ã€‚デフォルトã®è¡¨ç¤ºã®æ¨ªå¹…ã¯130æ–‡å—ã§ã™ã€‚å¿…è¦ã«å¿œã˜ã¦ --width オプションã§å¤‰æ›´ã§ãã¾ã™ã€‚ ã“ã†ã„ã£ãŸç”¨é€”ã«ã¯ meld ãªã©ã® GUI ã® diff ツールを使ãˆã°ã„ã„ã®ã§ã™ãŒã€ ssh 端末ã—ã‹ãªã„よã†ãªçŠ¶æ³ã§é‡å®ã—ã¾ã™ã€‚ --strip-trailing-cr ã¯è¡Œæœ«ã® CR を無視ã™ã‚‹æ©Ÿèƒ½ã§ã™ã€‚改行コード㌠CRLF 㨠LF ã§é£Ÿã„é•ã£ã¦ã„ã‚‹ã‘ã©ã€ä¸èº«ã¯ã»ã¼åŒã˜ã€ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’比較ã™
1
リリースã€éšœå®³æƒ…å ±ãªã©ã®ã‚µãƒ¼ãƒ“スã®ãŠçŸ¥ã‚‰ã›
最新ã®äººæ°—エントリーã®é…ä¿¡
j次ã®ãƒ–ックマーク
kå‰ã®ãƒ–ックマーク
lã‚ã¨ã§èªã‚€
eコメント一覧を開ã
oページを開ã
Kaleidoscope — File comparison for Mac
Git Diff with Vimdiff
{{#tags}}- {{label}}
{{/tags}}