[B! diff] decoy2004ã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

decoy2004 id:decoy2004

diffã«é–¢ã™ã‚‹decoy2004ã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (31)

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

image-diff - ç”»åƒã®å·®åˆ†è¡¨ç¤º
MOONGIFTã¯ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãƒ»ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã‚’ç´¹ä»‹ã™ã‚‹ãƒ–ãƒã‚°ã§ã™ã€‚2021å¹´07æœˆ16æ—¥ã§æ›´æ–°åœæ¢ã—ã¾ã—ãŸ é–‹ç™ºè€…ã§ã‚ã‚Œã°å·®åˆ†è¡¨ç¤ºã«æ™®æ®µã‹ã‚‰ãŠä¸–è©±ã«ãªã£ã¦ã„ã‚‹ã§ã—ã‚‡ã†ã€‚ã‚³ãƒ¼ãƒ‰ã®ã©ã“ã‚’ç›´ã—ãŸã®ã‹ã€ã©ã“ãŒå‰Šé™¤ã•ã‚ŒãŸã®ã‹ãªã©ã¯Diffã‚’ä½¿ã‚ãªã‹ã£ãŸã‚‰ç›®ã§æŽ¢ã™ã“ã¨ã«ãªã£ã¦ã¨ã¦ã‚‚å¤§å¤‰ã§ã™ã€‚ãã—ã¦ã€ãã‚Œã¯ãƒ†ã‚ã‚¹ãƒˆã ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ ä»Šå›žç´¹ä»‹ã™ã‚‹ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãƒ»ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã¯image-diffã€ç”»åƒã§å·®åˆ†è¡¨ç¤ºã‚’è¡Œã£ã¦ãã‚Œã‚‹ãƒ©ã‚¤ãƒ–ãƒ©ãƒªã§ã™ã€‚ image-diffã®ä½¿ã„æ–¹ ä¸€ã¤ç›®ã®ç”»åƒã§ã™ã€‚ äºŒã¤ç›®ã®ç”»åƒã§ã™ã€‚ å·®åˆ†ã‚’å–ã‚‹ã¨ã€ã“ã®ã‚ˆã†ãªç”»åƒãŒç”Ÿæˆã•ã‚Œã¾ã™ã€‚ image-diffã¯äºŒã¤ã®ç”»åƒã¨ã€ãã®å·®åˆ†ã¨ãªã‚‹ç”»åƒã®3ã¤ã®å¼•æ•°ã§å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚ãƒ—ãƒã‚°ãƒ©ãƒ ã®ä¸ã«çµ„ã¿è¾¼ã‚€ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ç•°ãªã‚‹éƒ¨åˆ†ãŒèµ¤ãè¡¨ç¤ºã•ã‚Œã‚‹ã®ã§ã€ã©ã“ãŒå¤‰ã‚ã£ã¦ã„ã‚‹ã®ã‹ã¯ä¸€ç›®çžç„¶ã§ã—ã‚‡ã†ã€‚ãƒ‡ã‚¶ã‚¤ãƒŠãƒ¼ã®æ–¹ãªã©ã¯å¿…é ˆã®ãƒ„ãƒ¼ãƒ«ã«ãªã‚‹ã®ã§ã¯ãªã„ã§ã—
decoy2004 2016/08/19
diff

image
ãƒªãƒ³ã‚¯
ExcelCompare - Excelãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†è¡¨ç¤º
MOONGIFTã¯ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãƒ»ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã‚’ç´¹ä»‹ã™ã‚‹ãƒ–ãƒã‚°ã§ã™ã€‚2021å¹´07æœˆ16æ—¥ã§æ›´æ–°åœæ¢ã—ã¾ã—ãŸ ã‚ªãƒ•ã‚£ã‚¹ã§ã®ä»•äº‹ã«å¾¹åº•çš„ã«ä½¿ã‚ã‚Œã¦ã„ã‚‹ã®ãŒExcelã§ã™ã€‚è·äººãŸã¡ã®æ‰‹ã«ã‹ã‹ã‚Œã°ã€è¡¨è¨ˆç®—ã®ã¿ãªã‚‰ãšã‚ã‚‰ã‚†ã‚‹å ´é¢ã«ãŠã„ã¦ExcelãŒåˆ©ç”¨ã•ã‚Œã¾ã™ã€‚ãƒ¡ãƒ¼ãƒ«ã§ã‚‚é€ã‚‰ã‚Œã€ä¿®æ£ã•ã‚Œã¦ã€ã‚³ãƒ”ãƒ¼ã—ã¦ä¿®æ£ã—ã¦â€¦ã¨å¤šãã®äººãŸã¡ã«ä½¿ã‚ã‚Œã¦ã„ã¾ã™ã€‚ ãã®çµæžœã€å¤šãã®ã‚³ãƒ”ãƒ¼ã¨ã©ã‚ŒãŒæœ€æ–°ã§ä½•ãŒé•ã†ã®ã‹åˆ†ã‹ã‚‰ãªã„Excelãƒ•ã‚¡ã‚¤ãƒ«ã«æº¢ã‚Œã‹ãˆã‚Šã¾ã™ã€‚ãã“ã§ä½¿ã£ã¦ã¿ãŸã„ã®ãŒExcelCompareã§ã™ã€‚ ExcelCompareã®ä½¿ã„æ–¹ ExcelCompareã¯2ã¤ã®Excelãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŒ‡å®šã—ã¦å·®åˆ†ã‚’æŠ½å‡ºã—ã¾ã™ã€‚ $ excel_cmp spreadsheet.xlsx spreadsheet-2.xlsx DIFF Cell at Sheet1!B2 => '2016å¹´6æœˆ26æ—¥' v/s '2016å¹´7æœˆ2
decoy2004 2016/07/20
Excel

diff
ãƒªãƒ³ã‚¯
Github Gitlab ã§å·®åˆ†ã‚’è¦‹ã‚‹éš›ã«ã€ã‚¹ãƒšãƒ¼ã‚¹ã‚„ã‚¤ãƒ³ãƒ‡ãƒ³ãƒˆç‰ã® whitespace ã‚’ç„¡è¦–ã—ãŸå·®åˆ†ã‚’è¦‹ã‚‹ - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
decoy2004 2016/05/11
github

gitlab

diff
ãƒªãƒ³ã‚¯
git ã®å·®åˆ†æ¯”è¼ƒãƒ»ãƒžãƒ¼ã‚¸ã‚’ WinMerge ã§è¡Œã† - Qiita
> git diff diff --git a/main.cpp b/main.cpp index 198f012..6e1f7d5 100644 --- a/main.cpp +++ b/main.cpp @@ -4,7 +4,8 @@ int main() { A a; - printf("%X", &a); + printf("address = %X", &a); + hello(); hello(); return 0; } [diff] tool = WinMerge [difftool "WinMerge"] path = C:/Program Files/WinMerge/WinMergeU.exe cmd = \"C:/Program Files/WinMerge/WinMergeU.exe\" -f \"*.*\" -e -u -r \"$LOCAL\" \"$REMO
decoy2004 2015/12/25
diff

merge

Windows

WinMerge

git
ãƒªãƒ³ã‚¯
è¦–è¦šçš„ã«æŒ‡å®šã—ãŸã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã®å·®åˆ†ã‚’è¡¨ç¤ºã—ã¦ãã‚Œã‚‹ã‚µãƒ¼ãƒ“ã‚¹ã€ŒDiffdã€ | ãƒ©ã‚¤ãƒ•ãƒãƒƒã‚«ãƒ¼ãƒ»ã‚¸ãƒ£ãƒ‘ãƒ³
ã€ŒDiffdã€ã¯è¦–è¦šçš„ã«æŒ‡å®šã—ãŸã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã®å·®åˆ†ã‚’è¡¨ç¤ºã—ã¦ãã‚Œã‚‹ã‚µãƒ¼ãƒ“ã‚¹ã§ã™ã€‚ã‚³ãƒ¼ãƒ‰ãƒ™ãƒ¼ã‚¹ã§ã®å·®åˆ†ã§ã¯ãªãã€è¦–è¦šçš„ã«ã©ã®éƒ¨åˆ†ãŒã©ã†å¤‰åŒ–ã—ãŸã‹ã‚’ç¤ºã—ã¦ãã‚Œã¾ã™ã€‚ã²ã¨ç›®ã§å·®åˆ†ãŒç¢ºèªã§ãã‚‹ã®ã§ä¾¿åˆ©ã€‚ è©³ç´°ã¯ä»¥ä¸‹ã‚ˆã‚Šã€‚ã¾ãšDiffdã¸ã‚¢ã‚¯ã‚»ã‚¹ã—ã¾ã—ã‚‡ã†ã€‚ ã“ã¡ã‚‰ã«æ›¸ã‹ã‚Œã¦ã„ã‚‹ã‚ˆã†ã«ã€ã“ã®ã‚ˆã†ãªã‚³ãƒ¼ãƒ‰ãƒ™ãƒ¼ã‚¹ã®æ¯”è¼ƒã‚’ãªããã†ã¨ã„ã†è©¦ã¿ã§ã™ã€‚å®Ÿéš›ã‚³ãƒ¼ãƒ‰ã‚’è¦‹ã¦å·®åˆ†ã‚’ç¢ºèªã™ã‚‹ã®ã‚‚ã‚ˆã„ã§ã™ãŒã€ã‚„ã¯ã‚Šè¦–è¦šçš„ã«åˆ†ã‹ã‚‹ã‚‚ã®ã§ã‚ã‚Œã°ãã†ã—ãŸã„ã§ã™ã‚ˆãã€‚ Diffdã‚’ä½¿ã£ãŸçµæžœã¯ã“ã¡ã‚‰ã€‚ç·‘ã¨èµ¤ã®æž ã§å›²ã¾ã‚ŒãŸéƒ¨åˆ†ãŒå·®åˆ†ã‚’ç¤ºã—ã¦ã„ã¾ã™ã€‚ã‚³ãƒ¼ãƒ‰ã§æ¯”è¼ƒã™ã‚‹ã‚ˆã‚Šã‚‚åˆ†ã‹ã‚Šã‚„ã™ã„ã§ã™ãã€‚ãƒ‘ãƒƒã¨ã¿ã¦ã©ã“ã«å¤‰åŒ–ãŒã‚ã£ãŸã®ã‹èª¿ã¹ã‚‰ã‚Œã‚‹ã®ã§ã€ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ã§ãªã„æ–¹ã§ã‚‚å·®åˆ†ã‚’è¦‹ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãœã²ã‚¦ã‚§ãƒ–ã‚µã‚¤ãƒˆã®å·®åˆ†ã‚’æ¯”è¼ƒã—ãŸã„ã¨ãã«ã”æ´»ç”¨ãã ã•ã„ã€‚ Diffd ï¼ˆã‚«ãƒ¡ãã¡ï¼‰
decoy2004 2015/11/20
diff
ãƒªãƒ³ã‚¯
è¤‡æ•°ç”»åƒã‹ã‚‰å…±é€šéƒ¨åˆ†oréžå…±é€šéƒ¨åˆ†ã‚’æŠ½å‡ºã™ã‚‹ãƒ„ãƒ¼ãƒ«ã‚’Javaã§ä½œã£ãŸ - Qiita
#æ¦‚è¦ ã‚¿ã‚¤ãƒˆãƒ«ã®é€šã‚Šã§ã™ã€‚GIMPç‰ã®ç”»åƒå‡¦ç†ã‚½ãƒ•ãƒˆã§å·®åˆ†ä½œæˆã¯å¯èƒ½ã™ãŒã€æ£ç›´é¢å€’è‡ã„ã®ã§ãƒ—ãƒã‚°ãƒ©ãƒ ã‚’æ›¸ã„ã¦æ¸ˆã¾ã›ã¾ã™ã€‚ #ãƒ‰ãƒ©ãƒƒã‚°ï¼†ãƒ‰ãƒãƒƒãƒ—ã‚’å®Ÿè£…ã™ã‚‹ ã¾ãšã¨ã‚Šã‚ãˆãšUIã‚’ã©ã†ã™ã‚‹ã‹ãªãƒ¼ã£ã¨åæ•°åˆ†è€ƒãˆãŸçµæžœã€æ¬¡ã®ã‚ˆã†ãªç”»é¢ã«ãªã‚Šã¾ã—ãŸã€‚ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³å¼•æ•°ã‹ã‚‰ã€åŒæ™‚ã«èªã¿è¾¼ã‚€ç”»åƒæ•°ã¯å¹¾ã‚‰ã§ã‚‚å¢—ã‚„ã›ã‚‹ã‚ˆã†ã«ã—ã¦ã„ã¾ã™ã€‚ ã§ã€ã€Œå‚ç…§ãƒœã‚¿ãƒ³ã‚’æ¯Žå›žæŠ¼ã™ã€ã ã‘ã§ã‚‚è‰¯ã„ã¨æ€ã£ã¦ã„ãŸã®ã§ã™ãŒã€ãƒ•ã‚¡ã‚¤ãƒ«é¸æŠžãƒ€ã‚¤ã‚¢ãƒã‚°ã‚’æŠ¼ã™åº¦ã«æ¯Žå›žã‚«ãƒ¬ãƒ³ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒå…ƒã«æˆ»ã‚‹ã®ã§ã‚¯ã‚½é¢å€’ãªã“ã¨ã«æ°—ã¥ã„ãŸã®ã§ã€ãƒ‰ãƒ©ãƒƒã‚°ï¼†ãƒ‰ãƒãƒƒãƒ—æ©Ÿèƒ½ã‚‚ä»˜åŠ ã™ã‚‹ã“ã¨ã«ã—ã¾ã—ãŸã€‚ ãƒ‰ãƒ©ãƒƒã‚°ï¼†ãƒ‰ãƒãƒƒãƒ—æ©Ÿèƒ½è‡ªä½“ã¯ã€ä»¥å‰æ›¸ã„ãŸã“ã¨ãŒã‚ã‚‹ã®ã§æ¥½ã€…å®Ÿè£…ã§ããŸã®ã§ã™ãŒã€å•é¡Œã¯ã€Œã©ã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã«ãƒ‰ãƒãƒƒãƒ—ã•ã‚ŒãŸã‹ã‚’åˆ¤å®šã™ã‚‹ã‹ã€ã§ã—ãŸã€‚ãã®å›žç”ã¨ã—ã¦ateraiã•ã‚“ã‹ã‚‰æ•™ãˆã‚‰ã‚ŒãŸã®ã¯ã€TransferHandler.TransferSupport#getCo
decoy2004 2015/10/30
java

ç”»åƒ

diff
ãƒªãƒ³ã‚¯
WinMergeã‚’ä½¿ã£ã¦gitãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰å·®åˆ†ãƒ¬ãƒãƒ¼ãƒˆã‚’ä½œæˆã™ã‚‹ - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
decoy2004 2015/10/20
git

diff
ãƒªãƒ³ã‚¯
2ã¤ã®Excelãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†ã‚’æ¯”è¼ƒã™ã‚‹ãƒ„ãƒ¼ãƒ« - è’¼ã®çŽ‹åº§ãƒ»è£å£
Excel 2013ã§ã¯ã€æ¨™æº–ã§2ã¤ã®Excelãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”è¼ƒã—ã¦ã€å·®åˆ†ã‚’è¡¨ç¤ºã™ã‚‹ãƒ„ãƒ¼ãƒ«ãŒåŒæ¢±ã•ã‚Œã¦ã„ã¾ã™ã®ã§ã€ä½¿ç”¨æ–¹æ³•ã‚’èª¬æ˜Žã—ã¾ã™ã€‚ ï¼‘ï¼Žãƒ•ã‚¡ã‚¤ãƒ«ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’é¸æŠžã—ã¾ã™ã€‚ ï¼’ï¼Žã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’é¸æŠžã—ã¾ã™ã€‚ ï¼“ï¼Žã‚¢ãƒ‰ã‚¤ãƒ³ã‚’é¸æŠžã—ã¾ã™ã€‚ ï¼”ï¼Žç®¡ç†ã‹ã‚‰ã€ŒCOMã‚¢ãƒ‰ã‚¤ãƒ³ã€ã‚’é¸æŠžã—ã¾ã™ã€‚ ï¼•ï¼Žè¨å®šãƒœã‚¿ãƒ³ã‚’ã‚¯ãƒªãƒƒã‚¯ã—ã¾ã™ã€‚ ï¼–ï¼ŽInquireã«ãƒã‚§ãƒƒã‚¯ã‚’å…¥ã‚Œã€OKãƒœã‚¿ãƒ³ã‚’ã‚¯ãƒªãƒƒã‚¯ã—ã¾ã™ã€‚ ï¼—ï¼ŽINQUIREã‚¿ãƒ–ã‚’é¸æŠžã—ã¾ã™ã€‚ ï¼˜ï¼Žæ¯”è¼ƒã—ãŸã„Excelãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚ã‚‰ã‹ã˜ã‚ï¼’ã¤é–‹ã„ã¦ãŠãã¾ã™ã€‚ ï¼™ï¼Žãƒ•ã‚¡ã‚¤ãƒ«ã®æ¯”è¼ƒã‚’é¸æŠžã—ã¾ã™ã€‚ ï¼‘ï¼ï¼Žãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”è¼ƒã—ã¾ã™ã€‚æ¯”è¼ƒãƒœã‚¿ãƒ³ã‚’ã‚¯ãƒªãƒƒã‚¯ã—ã¾ã™ã€‚ ï¼‘ï¼‘ï¼ŽçµæžœãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚
decoy2004 2015/10/14
ä¸ä¾¿ãªæ©Ÿèƒ½ã ãªã€‚ä¸€åº¦ã«æ¯”è¼ƒã™ã‚‹ã®ã¯2ãƒ•ã‚¡ã‚¤ãƒ«ã ã‘ãªã®ã‹ã€‚

diff

excel

ãƒ„ãƒ¼ãƒ«
ãƒªãƒ³ã‚¯
æš—å·åŒ–ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’git diffã™ã‚‹ - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
decoy2004 2015/10/04
git

æš—å·åŒ–

diff
ãƒªãƒ³ã‚¯
https://qiita.com/BeatsMe1978/items/4b954eb75d9af947cb25
decoy2004 2015/04/16
diff

git

office

excel

word

pandoc
ãƒªãƒ³ã‚¯
git diff ã®ã‚«ãƒ©ãƒ¼ãƒªãƒ³ã‚°ã‚’ã—ã¦ã¿ã‚„ã™ãã™ã‚‹ - ãã‚Œãƒžã‚°ã§ï¼
git ã§å·®åˆ†ã‚’ã‚‚ã†å°‘ã—è¦‹ã‚„ã™ããªã‚‹ [pager] log = diff-highlight | less show = diff-highlight | less diff = diff-highlight | less [color] ui = true diff-highlight ã¨ã¯ãªã‚“ãžã‚„ï¼Ÿ git ã«å«ã¾ã‚Œã‚‹ã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚ takuya@atom:~$ ls -l /usr/bin/diff-highlight lrwxrwxrwx 1 root root 56 1æœˆ 30 01:57 /usr/bin/diff-highlight -> /usr/share/doc/git/contrib/diff-highlight/diff-highlight ã‚ãŸã—ã¯ln -s ã§ãƒªãƒ³ã‚¯ä½œã£ã¦ä½¿ã†ã“ã¨ã«ã—ã¦ã„ã¾ã™ã€‚ ui = true ã“ã‚Œã‚’æ›¸ãã¨è‰²ãŒã¤ã ã•ã‚‰ã«ã€ä¸€è¡Œã«è¡¨ç¤ºã—ãŸã„
decoy2004 2015/02/09
diff

git
ãƒªãƒ³ã‚¯
Markdown diffÂ·Markdownãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã®è§£æž/ãƒ“ã‚¸ãƒ¥ã‚¢ãƒ«åŒ– MOONGIFT
Markdowné–¢é€£ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ãŒã¨ã¦ã‚‚å¤šããªã£ã¦ã„ã¾ã™ã€‚è»½é‡ãƒžãƒ¼ã‚¯ã‚¢ãƒƒãƒ—è¨€èªžã®ã‚·ã‚§ã‚¢ã¯MarkdownãŒåŠåˆ†ä»¥ä¸Šã«ãªã£ã¦ã„ã‚‹ã®ã§ã¯ãªã„ã§ã—ã‚‡ã†ã‹ã€‚ãã†ã‚„ã£ã¦ã‚³ãƒ³ãƒ†ãƒ³ãƒ„ãŒå¢—ãˆã¦ã„ãã¨ã€æ¬¡ã«ä½œæˆã‹ã‚‰æ´»ç”¨ã®æ®µéšŽã«å…¥ã£ã¦ã„ãã¾ã™ã€‚ å˜ç´”ã«HTMLãƒ•ã‚¡ã‚¤ãƒ«ã«ã™ã‚‹ã ã‘ã§ãªãã€ã‚‚ã£ã¨Markdownãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã‚’æ´»ç”¨ã—ãŸã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ãŒå‡ºã¦ãã‚‹ã“ã¨ã§ã—ã‚‡ã†ã€‚ãã®ãƒ™ãƒ¼ã‚¹ã«ä½¿ãˆãã†ãªã®ãŒMarkdown diffã§ã™ã€‚ Markdown diffã®ä½¿ã„æ–¹ Markdown diffã¯Markdownãƒ•ã‚¡ã‚¤ãƒ«åŒå£«ã®å·®åˆ†ãŒã¨ã‚Œã‚‹ã‚ˆã†ãªã®ã§ã™ãŒã€åŸ·ç†æ™‚ç‚¹ã§ã¯ãã®ã‚³ãƒžãƒ³ãƒ‰ã¯ç”¨æ„ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚ç¾åœ¨ã¯æ§‹é€ è§£æžãŒã§ãã‚‹ã‚ˆã†ã§ã™ã€‚ $ mdast README.md { t: 'Document', start_line: 1, start_column: 1, end_line: 58, children: [ {
decoy2004 2015/01/18
Markdown

diff

graphviz
ãƒªãƒ³ã‚¯
java-mysql-diff ãŒå‡ºãŸ - ãã®æ‰‹ã®å¹³ã¯å°»ã‚‚ã¤ã‹ã‚ã‚‹ã•
java-mysql-diff ãŒå‡ºã¾ã—ãŸï¼ŽMaven Central ã«ã‚‚ãƒªãƒªãƒ¼ã‚¹ã—ã¦ã„ã¾ã™ï¼Ž http://search.maven.org/#artifactdetails|net.moznion|mysql-diff|1.0.0| æœ¬ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã¯ id:onishi ã•ã‚“ä½œã® mysqldiff ã® Java 8 ç§»æ¤ç‰ˆã§ã™ï¼Ž æœ€è¿‘ Java ã®ç’°å¢ƒã§ä½œæ¥ã™ã‚‹ã“ã¨ãŒå¤šã„ã®ã§ï¼Œãªã‚“ã ã‹ã‚“ã ã§ Java ç‰ˆãŒã‚ã‚‹ã¨ä¾¿åˆ©ã ã‚ˆãã€œã¨ã„ã†ã“ã¨ã§ä½œæˆã—ã¾ã—ãŸï¼Ž æœ¬å®¶ã® Perl ç‰ˆ mysqldiff ã¨åŒã˜ã‚ˆã†ãªæ„Ÿè¦šã§åˆ©ç”¨ã—ãŸã‹ã£ãŸã®ã§ï¼Œå…¨éƒ¨ã®ä¾å˜ãƒ‘ãƒƒã‚±ãƒ¼ã‚¸ã‚’1ã¤ã«ã¾ã¨ã‚ãŸ fat-jar ã‚‚ç”¨æ„ã—ã¦ã‚ã‚Šã¾ã™ï¼Ž java -jar ã¨ã„ã†ã‚³ãƒžãƒ³ãƒ‰ã‚’ä½™åˆ†ã«ã‚¿ã‚¤ãƒ—ã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã™ãŒï¼ŒPerl ç‰ˆã¨åŒã˜ã‚ˆã†ãªæ„Ÿè¦šã§åˆ©ç”¨ã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ï¼Ž https://github.com/moznion/j
decoy2004 2015/01/11
database

diff

mysql

java
ãƒªãƒ³ã‚¯
cccv â€“ å·®åˆ†ã‚’ä½¿ã£ã¦ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã®é‡è¤‡ã‚’æŽ¢ã™
MOONGIFTã¯ã‚ªãƒ¼ãƒ—ãƒ³ã‚½ãƒ¼ã‚¹ãƒ»ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã‚’ç´¹ä»‹ã™ã‚‹ãƒ–ãƒã‚°ã§ã™ã€‚2021å¹´07æœˆ16æ—¥ã§æ›´æ–°åœæ¢ã—ã¾ã—ãŸ ãƒ—ãƒã‚°ãƒ©ãƒŸãƒ³ã‚°ã§ã‚„ã£ã¦ã¯ã„ã‘ãªã„ã“ã¨ã®ä¸€ã¤ã«ã‚³ãƒ”ãƒšãŒã‚ã‚Šã¾ã™ã€‚å ´åˆã«ã‚ˆã£ã¦ã¯å¿…è¦ä¸å¯æ¬ ãªæ™‚ã‚‚ã‚ã‚Šã¾ã™ãŒã€åŸºæœ¬çš„ã«ã‚³ãƒ”ãƒšã™ã‚‹ãªã‚‰é–¢æ•°ã«ã¾ã¨ã‚ãŸã‚Šã€ãƒ©ã‚¤ãƒ–ãƒ©ãƒªåŒ–ã™ã‚‹ã“ã¨ã§ã‚³ãƒ¼ãƒ‰ã®é‡è¤‡ã‚’ãªãã™ã¹ãã§ã—ã‚‡ã†ã€‚ ãã“ã§ä½¿ã£ã¦ã¿ãŸã„ã®ãŒcccvã§ã™ã€‚ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã‚’å·®åˆ†ã‹ã‚‰æ´—ã„å‡ºã—ã¦ã€ã‚³ãƒ¼ãƒ‰ã®é‡è¤‡ãŒãªã„ã‹ãƒã‚§ãƒƒã‚¯ã—ã¦ãã‚Œã‚‹ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€‚ cccvã®ä½¿ã„æ–¹ ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã¯Goã§è¡Œã„ã¾ã™ã€‚ $ go get github.com/artemave/cccv ä½¿ã„æ–¹ã¨ã—ã¦ã¯Diffã‚’æ¸¡ã™å½¢ã§ã™ã€‚ $ git diff master | cccv Possible copy/paste sources: app/controllers/sessions_controller.rb: 9: if pa
decoy2004 2014/08/26
diff ã‚’å…¥åŠ›ã™ã‚‹ã¨å¢—ãˆãŸéƒ¨åˆ†ã ã‘æ¤œæŸ»ã™ã‚‹ã€‚å·®åˆ†æ¤œæŸ»ã™ã‚‹ãƒ„ãƒ¼ãƒ«ãŒæ¬²ã—ã‹ã£ãŸã€‚ã€Žä¿®æ£ã—ãŸéƒ¨åˆ†ã¨ã€å…ƒã€…ã®ã‚³ãƒ¼ãƒ‰ã§é‡è¤‡ã™ã‚‹éƒ¨åˆ†ã‚’æ´—ã„å‡ºã—ã¦ãã‚Œã¾ã™ã€‚ã€

ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰

diff

Go
ãƒªãƒ³ã‚¯
GitHub - Vaduz/xlsx-textconv-rb
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
decoy2004 2014/06/20
excel

ruby

diff
ãƒªãƒ³ã‚¯
YappoLogs: xlsx ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ git diff ã—ã‚„ã™ãã™ã‚‹ç‚ºã®å¤©æ‰çš„ãª wrapper script ã‚’æ›¸ã„ãŸ
çš†ã•ã‚“ã¯ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒªã‚½ãƒ¼ã‚¹ã¨ã—ã¦ã‚¨ã‚¯ã‚»ãƒ«ã® xlsx ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä½¿ã†äº‹ãŒã‚ã‚‹ã¨æ€ã„ã¾ã™ã€‚ ä½•ã¦ã£ãŸã£ã¦äº‹å‹™è·ã®äººã§ã™ã‚‰æ¥½ã€…ä½¿ãˆã‚‹ã‚¹ãƒ¼ãƒ‘ãƒ¼å„ªã‚ŒãŸ UI ãªã®ã§ã€ web ã®ç®¡ç†ç”»é¢ã¨ã‹ã‚’ä½œã‚Šè¾¼ã‚€ã‚ˆã‚Šã‚‚ã‚¨ã‚¯ã‚»ãƒ«ã§ã‚·ãƒ¼ãƒˆä½œã£ã¦ã‚‚ã‚‰ã£ã¦ã—ã¾ã£ãŸæ–¹ãŒæ—©ã„ã‚±ãƒ¼ã‚¹ã‚‚å¤šã„ã‚“ã§ã™ã€‚ç¾å®Ÿã®ä¸–ç•Œã§ã¯ã€‚ ã§ã€æ™®é€šã®äººã¯ TSV ã«ã™ã‚‹ã ã® CSV ã«ã—ã¦ã‚‚ã‚‰ã†ã ã®ã™ã‚‹ã¨æ€ã†ã‚“ã§ã™ãŒã€ä¸€æ–¹çš„ã«ãƒ‡ãƒ¼ã‚¿è²°ã†ã ã‘ãªã‚‰è‰¯ã„ã‚“ã ã‘ã©ã€ç›¸æ‰‹ã¨ã‚„ã‚Šå–ã‚Šã™ã‚‹æ™‚ã«ã¯ã©ã†ã—ã¦ã‚‚ xlsx ãƒ•ã‚¡ã‚¤ãƒ«çµŒç”±ã¨ã‹ã«ã—ãªã„ã¨ç›¸æ‰‹ãŒã“ã¾ã‚‹ï¼ã‚„ã£ã±ã‚Šã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ã®ã‚¨ã¯å„ªã—ã•ã®ã‚¨ã ã‹ã‚‰ç›¸æ‰‹ã«å„ªã—ãã—ãªã„ã¨ã ã‚ã§ã™ã€‚ ã§ã€ xslx ãƒ•ã‚¡ã‚¤ãƒ«ã§ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ä»¥å¤–ã®äººã¨ãƒ‡ãƒ¼ã‚¿ã‚„ã‚Šå–ã‚Šã™ã‚‹ã¨ã‚„ã£ã±ã‚Šã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã—ãŸããªã‚‹ã®ãŒäººæƒ…ã§ã™ã€‚ ã§ã‚‚ xslx ãƒ•ã‚¡ã‚¤ãƒ«ã¯ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ãªã®ã§ git diff ã¨ã‹ãŒæ®‹å¿µã§ã™ã€‚ã€‚ã€‚ ã£ã¦äº‹ã§ä½œã£ã¡ã‚ƒã„ã¾ã—ãŸã€‚ h
decoy2004 2014/06/20
git

diff

excel
ãƒªãƒ³ã‚¯
ã‚¤ãƒ³ãƒ‡ãƒ³ãƒˆã‚³ãƒŸãƒƒãƒˆã§çœŸçŠ¯äººãŒã‚ã‹ã‚‰ãªããªã£ãŸå ´åˆã® git blame
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
decoy2004 2014/04/02
git

blame

diff
ãƒªãƒ³ã‚¯
ã‚µãƒ¼ãƒé–“ã§diffã‚’ã¨ã‚‹æ–¹æ³• Â· DQNEOæ—¥è¨˜
è¤‡æ•°ã‚µãƒ¼ãƒé–“ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”è¼ƒã—ãŸã„ã¨ãã¯ã“ã†ã™ã‚Œã°ã‚ˆã„ã§ã™ã€‚ ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒªãƒ¢ãƒ¼ãƒˆã‚µãƒ¼ãƒã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”è¼ƒ $ ssh remotename cat /etc/hosts | diff /etc/hosts - ã“ã†ã„ã†æ›¸ãæ–¹ã‚‚ã‚ã‚Šã¾ã™ã€‚ $ diff <(ssh remotename cat /etc/hosts) /etc/hosts ãƒªãƒ¢ãƒ¼ãƒˆã‚µãƒ¼ãƒé–“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”è¼ƒ $ diff <(ssh remote1 cat /etc/hosts) <(ssh remote2 cat /etc/hosts) è§£èª¬ ssh hostname cat /path/to/file "cat /path/to/file"ã¨ã„ã†ã‚³ãƒžãƒ³ãƒ‰ã‚’åˆ¥ã‚µãƒ¼ãƒ(hostname)ä¸Šã§å®Ÿè¡Œã•ã›ã¦ã€çµæžœã‚’è‡ªãƒžã‚·ãƒ³ã®æ¨™æº–å‡ºåŠ›ã«å‡ºåŠ›ã—ã¾ã™ã€‚ diff /path/to/file - diffã§ã€ãƒ•ã‚¡ã‚¤ãƒ«åã‚’æŒ‡å®šã™ã‚‹ä»£
decoy2004 2014/03/24
diff

SSH
ãƒªãƒ³ã‚¯
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ãƒªãƒã‚¸ãƒˆãƒªã«ç§»å‹•ã—ã¾ã™ã€‚ä¾‹ãˆã°æœ€å¾Œã®ã‚³ãƒŸãƒƒãƒˆã¨ã®æ¯”è¼ƒã¯ã“ã‚“ãªæ„Ÿã˜ã§ã™ã€‚
decoy2004 2014/03/24
diff

github

tool

git

node.js

npm

development
ãƒªãƒ³ã‚¯
WinMerge æ—¥æœ¬èªžç‰ˆ
ã‚µãƒ¼ãƒ“ã‚¹çµ‚äº†ã®ãŠçŸ¥ã‚‰ã› ã„ã¤ã‚‚Yahoo! JAPANã®ã‚µãƒ¼ãƒ“ã‚¹ã‚’ã”åˆ©ç”¨ã„ãŸã ãèª ã«ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã™ã€‚ ãŠå®¢æ§˜ãŒã‚¢ã‚¯ã‚»ã‚¹ã•ã‚ŒãŸã‚µãƒ¼ãƒ“ã‚¹ã¯æœ¬æ—¥ã¾ã§ã«ã‚µãƒ¼ãƒ“ã‚¹ã‚’çµ‚äº†ã„ãŸã—ã¾ã—ãŸã€‚ ä»Šå¾Œã¨ã‚‚Yahoo! JAPANã®ã‚µãƒ¼ãƒ“ã‚¹ã‚’ã”æ„›é¡§ãã ã•ã„ã¾ã™ã‚ˆã†ã€ã‚ˆã‚ã—ããŠé¡˜ã„ã„ãŸã—ã¾ã™ã€‚
decoy2004 2014/03/20
ã€Žãƒ•ã‚¡ã‚¤ãƒ«ã®æ–‡å—ã‚³ãƒ¼ãƒ‰è‡ªå‹•æ¤œå‡º([ç·¨é›†]â†’[è¨å®š]â†’[ã‚³ãƒ¼ãƒ‰ãƒšãƒ¼ã‚¸]ã‚«ãƒ†ã‚´ãƒªâ†’[mlang.dll ... ]ã‚’ãƒã‚§ãƒƒã‚¯). 3ãƒ•ã‚¡ã‚¤ãƒ«æ¯”è¼ƒã€3ãƒ•ã‚©ãƒ«ãƒ€æ¯”è¼ƒã€

Windows

subversion

diff

ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆ
ãƒªãƒ³ã‚¯
1 2 æ¬¡ã®ãƒšãƒ¼ã‚¸