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

kiyo_hiko id:kiyo_hiko

diffã«é–¢ã™ã‚‹kiyo_hikoã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (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}}

How to â€˜diffâ€™ two subroutines in the same file in Vim?
kiyo_hiko 2023/11/20
ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã§ã§ãã‚‹ã‚‰ã—ã„ã€‚ã§ãã‚Œã°ç”ŸVimã§ä½•ã‹ç°¡å˜ã«ã‚„ã‚ŠãŸã„ãŒâ€¦

Vim

diff
ãƒªãƒ³ã‚¯
Word æ–‡æ›¸ã®å·®åˆ†è¡¨ç¤ºï¼ˆæ¯”è¼ƒè¡¨ç¤ºï¼‰ â€“ ãƒ—ãƒã‚°ãƒ©ãƒŸãƒ³ã‚°ç”Ÿæ”¾é€
Microsoft Word æ–‡æ›¸ã®å·®åˆ†ã‚’ç¢ºèªã™ã‚‹æ–¹æ³•ã§ã™ã€‚ãµãŸã¤ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ¯”è¼ƒã—ã¾ã™ã€‚ Word 2010/2013 ã®æ¯”è¼ƒã™ã‚‹æ–¹æ³• ã“ã®ã‚ˆã†ã«å¤‰æ›´å±¥æ´ï¼ˆå¤‰æ›´ç®‡æ‰€ï¼‰ã®è¡¨ç¤ºã€æ¯”è¼ƒçµæžœæ–‡æ›¸ï¼ˆãƒžãƒ¼ã‚¸ã—ãŸå†…å®¹ï¼‰ã¨ã€å…ƒã®æ–‡æ›¸ãƒ»å¤‰æ›´ã•ã‚ŒãŸæ–‡æ›¸ã‚’åŒæ™‚ã«è¡¨ç¤ºã§ãã¾ã™ã€‚ã‚¹ã‚¯ãƒãƒ¼ãƒ«ã‚‚åŒæœŸã—ã¾ã™ã€‚ æ¯”è¼ƒæ–¹æ³•ã¯ã€æ ¡é–²ã‚¿ãƒ–ã®ã€Œæ¯”è¼ƒã€ã‹ã‚‰ã€Œæ¯”è¼ƒã€ã‚’é¸æŠžã€‚æ¯”è¼ƒã™ã‚‹æ–‡æ›¸ã‚’é¸ã³ã¾ã™ã€‚ å…ƒã®æ–‡æ›¸ãƒ»å¤‰æ›´ã•ã‚ŒãŸæ–‡æ›¸ã®è¡¨ç¤ºåˆ‡ã‚Šæ›¿ãˆã¯ã€ã€Œæ¯”è¼ƒã€ã®ã€Œå…ƒã®æ–‡æ›¸ã‚’è¡¨ç¤ºã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰ã€‚ å¤‰æ›´å±¥æ´ã®è¡¨ç¤ºåˆ‡ã‚Šæ›¿ãˆã¯ã€æ ¡é–²ã‚¿ãƒ–ã®ã€Œå¤‰æ›´å±¥æ´ã€ã«ã‚ã‚‹ãƒ‰ãƒãƒƒãƒ—ãƒ€ã‚¦ãƒ³ãƒªã‚¹ãƒˆã‹ã‚‰ã€‚ TortoiseGit ã§ç®¡ç†ã—ã¦ã„ã‚‹ã¨ã€æ—¢å®šã§ã¯å·®åˆ†è¡¨ç¤ºã®ã¨ãã“ã®ã‚ˆã†ãªå½¢ã§é–‹ã„ã¦ãã‚Œã‚‹ã‚ˆã†ã§ã™ã€‚ WinMerge ã§æ¯”è¼ƒã™ã‚‹æ–¹æ³• diff ãƒ„ãƒ¼ãƒ« WinMerge ã§ã¯ã€ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã§ Word æ–‡æ›¸ã®æ¯”è¼ƒã‚‚ã§ãã¾ã™ã€‚ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ãƒ¼ã§ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã‚‚ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¾ã—ã‚‡ã†
kiyo_hiko 2018/10/11
ãƒ—ãƒç”Ÿã¡ã‚ƒã‚“

word

diff
ãƒªãƒ³ã‚¯
nyarn.tech
Buy this domain. nyarn.tech 2020 Copyright. All Rights Reserved. The Sponsored Listings displayed above are served automatically by a third party. Neither the service provider nor the domain owner maintain any relationship with the advertisers. In case of trademark issues please contact the domain owner directly (contact information can be found in whois). Privacy Policy
kiyo_hiko 2017/11/22
å°ç²’ã§ã†ã‚Œã—ã„tipsã ã£ãŸ

github

tips

ä¾¿åˆ©

diff
ãƒªãƒ³ã‚¯
Powershell script to print diff output in color
kiyo_hiko 2017/11/20
ã‚ˆã„ã€‚Gitä½¿ãˆãªã„ç’°å¢ƒã§æœ‰ç”¨ã’ã€‚ãã‚‚ãã‚‚Gitä½¿ã„ãŸã„

åˆ¶ç´„ç’°å¢ƒç”¨

powershell

ps1

diff
ãƒªãƒ³ã‚¯
Git diff --name-only and copy that list
kiyo_hiko 2017/05/19
cp -pv --parents `git diff --diff-filter=ACMRTUXB --name-only COMMITID_ETC` DEST_DIR

git

diff

å·®åˆ†

cp
ãƒªãƒ³ã‚¯
Filter git diff by type of change
Is there a way to limit git diff to changed files? I'd like to see the differences between two commits, but exclude paths that don't exist in one or the other (additions/deletions). The following Perl one-liner illustrates most of what I want: git diff master.. | perl -lnwe 'print unless /^(new|deleted) file/../^diff/ and not /^diff/' But that leaves diff --git a/path b/path lines for the files th
kiyo_hiko 2017/05/19
å·®åˆ†ã‚’é€ä¿¡ã—ãŸã„ã®ã§ã•ãŒã™ã¨ãã€git diffã ã¨æƒ…å ±é‡ãŒå¤šã™ãŽã‚‹git diff --name-onlyã ã¨æ¶ˆã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã¨ã‹ã‚‚è¡¨ç¤ºã•ã‚Œã¦ç´›ã‚‰ã‚ã—ã„â†’git diff --diff-filter=D --name-onlyã¨ã‹ã§ãƒã‚§ãƒƒã‚¯ã§ãã‚‹ã¿ãŸã„ã€‚æ›´ã«æ¥½ãªæ–¹æ³•ã¯ã‚ã‚‹ã‹ãªï¼Ÿ

git

diff

tips

ä¾¿åˆ©
ãƒªãƒ³ã‚¯
GitHubã®ç”»åƒdiffãŒå‡„ã„
æ˜¨å¹´æœ«ã‹ã‚‰ä»•äº‹ã§ä½¿ã„å§‹ã‚ã¦ä»¥æ¥ã€ã™ã£ã‹ã‚ŠGitHubãŒãŠæ°—ã«å…¥ã‚Šã«ãªã£ã¦ã—ã¾ã£ãŸã€‚ GitHubãŒç´ æ•µãªã®ã¯ã€ä»Šã§ã‚‚æ—¥ã€…é€²åŒ–ã‚’ç¶šã‘ã¦ã„ã‚‹ã¨ã„ã†ã¨ã“ã‚ã ã€‚ä¾‹ãˆã°ã€å…ˆæ—¥å®Ÿè£…ã•ã‚ŒãŸcommité–²è¦§ã«ãŠã‘ã‚‹ç”»åƒãƒ“ãƒ¥ãƒ¼ã®æ©Ÿèƒ½æ‹¡å¼µãªã©ã‚‚ã€ãªã‚“ã ã‹ã™ã”ã„ã“ã¨ã«ãªã£ã¦ã„ã‚‹ã€‚ Behold: Image view modes - GitHub Blog æ–°ã—ã„ç”»åƒãƒ“ãƒ¥ãƒ¼ã§ã¯ã€ã‚³ãƒŸãƒƒãƒˆã«ã‚ˆã‚‹æ›´æ–°å†…å®¹ã‚’ï¼”ã¤ã®ãƒ¢ãƒ¼ãƒ‰ã§ç¢ºèªã§ãã‚‹ã‚ˆã†ã«ãªã£ã¦ã„ã‚‹ã€‚ä¾‹ãˆã°"Swipe"ãƒ¢ãƒ¼ãƒ‰ã§ã¯ã€ç”»åƒã®ä¸Šã‚’ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã“ã¨ã§ï¼’ã¤ã®ç”»åƒã‚’ã‚ãã‚‹ã‚ˆã†ã«è¦‹ã‚‹ã“ã¨ãŒã§ãã‚‹ã€‚ â€œDifference"ãƒ¢ãƒ¼ãƒ‰ã§ã¯ã€ï¼’ã¤ã®ç”»åƒã«ãŠã‘ã‚‹å·®åˆ†ã‚’è¦–è¦šåŒ–ã—ã¦è¡¨ç¤ºã™ã‚‹ã€‚ã“ã‚Œã¯å¤‰æ›´ã®åº¦åˆã„ãŒå°ã•ã„å ´åˆã«ã¨ã¦ã‚‚ä¾¿åˆ©ãªæ©Ÿèƒ½ã ã€‚ å®Ÿéš›ã«ãƒ‡ãƒ¢ã‚’è§¦ã£ã¦ã¿ã‚‹ã¨ã€æ©Ÿèƒ½ã®å†…å®¹ãŒã‚ˆãåˆ†ã‹ã‚‹ã¨æ€ã†ã€‚ å€‹äººçš„ã«ã¯ã€ã“ã‚Œã‚‰ã®æ©Ÿèƒ½ã¯ãƒ‡ã‚¶ã‚¤ãƒŠãƒ¼ã•ã‚“ã¨é€£æºã‚’ã™ã‚‹ã«ã‚ãŸã£ã¦ã€ã¨ã¦ã‚‚ã‚ã‚ŠãŒãŸ
kiyo_hiko 2017/04/06
github

image

diff
ãƒªãƒ³ã‚¯
gitã§å·®åˆ†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŠ½å‡ºã—ã¦zipã«ã¾ã¨ã‚ã‚‹æ–¹æ³•
Gitã§ãƒ•ã‚¡ã‚¤ãƒ«ç®¡ç†ã—ã¦ã„ã‚‹ã®ã«ã€ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆãŒGitä½¿ã£ã¦ã„ãªã„ã‹ã‚‰ç´å“ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ zip ã§é€ã‚‰ãªã‘ã‚Œã°ãªã‚‰ãªã„ãªã‚“ã¦ã“ã¨ãŒã‚ã£ãŸã‚Šã—ã¾ã™ã€‚ ä¸€åº¦ã«ã¾ã¨ã‚ã¦é€ã‚Œã‚‹æ™‚ã¯ã€ãƒãƒ¼ã‚«ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãã®ã¾ã¾ zip ã«ã™ã‚‹ã ã‘ã§ã™ãŒã€ãªãœã‹ã€Œå·®åˆ†ãƒ•ã‚¡ã‚¤ãƒ«ãŒã©ã‚Œã‹ã‚ã‹ã‚‹ã‚ˆã†ã«ãã ã•ã„ã€ãªã‚“ã¦ã„ã†ãªã‚“ã¨ã‚‚é¢å€’ãªä¾é ¼ãŒã‚ã£ãŸã‚Šã—ã¾ã™ã€‚ ã‚³ãƒžãƒ³ãƒ‰ä¸€ç™ºã¨ã‹ã§ã„ã„ã‹ã‚‰ã§ããªã„ã‹ãªãƒ¼ã¨æ¤œç´¢ã—ãŸã¨ã“ã‚ã€ Git ç®¡ç†ã•ãˆã—ã¦ã„ãŸã‚‰ã§ãã‚‹ï¼ ãƒ¡ãƒ¢ç”¨ã‚¨ãƒ³ãƒˆãƒªãƒ¼ã¨ã—ã¦ã®ã“ã—ã¦ãŠãã¾ã™ã€‚ 1å€‹å‰ã®ã‚³ãƒŸãƒƒãƒˆã‹ã‚‰ç¾åœ¨ã®ã‚³ãƒŸãƒƒãƒˆã¾ã§ã®å·®åˆ†ã‚’æŠ½å‡ºã—ã¦zipå‚è€ƒã«ã—ãŸã®ã¯ä¸‹è¨˜ã€‚ gitã§å·®åˆ†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’æŠ½å‡ºã™ã‚‹ - Qiita 1å€‹å‰ã®ã‚³ãƒŸãƒƒãƒˆã‹ã‚‰ç¾åœ¨ã®ã‚³ãƒŸãƒƒãƒˆã¾ã§ã®å·®åˆ†ã‚’æŠ½å‡ºã—ã¦zipã™ã‚‹å ´åˆã¯ä¸‹è¨˜ã®ã‚³ãƒžãƒ³ãƒ‰ã«ãªã‚‹ã‚ˆã†ã§ã™ã€‚ å‚è€ƒå…ˆã®ã§ã¯diffã®æœ€å¾ŒãŒ HEAD^ ã«ãªã£ã¦ã„ãŸã®ã§ã™ãŒã€ãã‚Œã§ã¯ã†ã¾ãå‹•ä½œã›ãšã«ã‚¨ãƒ©ãƒ¼ã«ãªã£ãŸã®
kiyo_hiko 2016/06/13
ãŠå®¢ã•ã‚“ã‹ã‚‰å·®åˆ†ã ã‘ãã‚Œã‚ˆã¨è¨€ã‚ã‚ŒãŸã¨ãã®æŠ€

git

ç´å“

diff

zip
ãƒªãƒ³ã‚¯
Compare two MySQL databases
Ask questions, find answers and collaborate at work with Stack Overflow for Teams. Explore Teams Collectivesâ„¢ on Stack Overflow Find centralized, trusted content and collaborate around the techno logies you use most. Learn more about Collectives
kiyo_hiko 2016/06/01
mysql

db

diff

tool
ãƒªãƒ³ã‚¯
https://boomi.com/wp-content/uploads/2021.11.23-Boomi-MSA-Web-Form.pdf
kiyo_hiko 2016/06/01
Dellã®ãƒ„ãƒ¼ãƒ«

mysql

db

diff

tool
ãƒªãƒ³ã‚¯
database comparator gui - Google æ¤œç´¢
ã™ã¹ã¦ç”»åƒå‹•ç”»æ›¸ç± 33 Data compare tools -... dbmstools.com Version 4.4.0 - database... dbgate.org Database Table Data... www.dbsolo.com SelectCompare - DBMS Tools dbmstools.com Nob Hill Database Compare -... dbmstools.com Schema Compare extension -... learn.microsoft.com Compare and synchronize the... www.xsql.com GitHub -... github.com EMS Data Comparer for MySQL... dbmstools.com Data compare Â·... github
kiyo_hiko 2016/06/01
ã“ã®ã¸ã‚“å¾Œã§ã¾ã¨ã‚ã¦è‡ªåˆ†ã®Wikiã‚µãƒ¼ãƒãƒ¼ã«æƒ…å ±ã‚’ã£è¾¼ã‚€

mysql

db

diff

tool
ãƒªãƒ³ã‚¯
MySQLã®ã‚¹ã‚ãƒ¼ãƒžãƒ¼ã‚’æ¯”è¼ƒã™ã‚‹ | ã‚¯ãƒã‚¸ã‚«
mysqldump -d -u root -p db1 --skip-create-options > C:\home\db1.sql mysqldump -d -u root -p db2 --skip-create-options > C:\home\db2.sql cd C:\home fc db1.sql db2.sql > diff.txt ãƒ†ãƒ¼ãƒ–ãƒ«æ§‹é€ ã®ã¿ã‚’ãƒ€ãƒ³ãƒ—ã€auto_incrementã§å·®åˆ†ã‚’å‡ºã—ãŸããªã„ã®ã§ã€ â€“skip-create-options ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’æŒ‡å®š
kiyo_hiko 2016/06/01
mysql

diff

compare

schema
ãƒªãƒ³ã‚¯
MySQL::diffã§ãƒ‡ãƒ—ãƒã‚¤æ™‚ã®DBã‚¹ã‚ãƒ¼ãƒžæ›´æ–°ã‚’è‡ªå‹•åŒ–ï¼ | å‰µä½œãƒ¡ãƒ¢å¸³
å‰å›žã®ã‚¨ãƒ³ãƒˆãƒª DBãƒ†ãƒ¼ãƒ–ãƒ«ã®å·®åˆ†ã‚’å‡ºåŠ›ã™ã‚‹MySQL::diffã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ ã®ç¶šãã§ã™ã€‚ å‰å›žã®ãŠã•ã‚‰ã„ã‚’å°‘ã—ã™ã‚‹ã¨ã€ MySQL::diff ã¯äºŒã¤ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚¹ã‚ãƒ¼ãƒžã‚’æ¯”è¼ƒã—ã¦å·®åˆ†ã® ALTER SQL ã‚’å‡ºåŠ›ã—ã¦ãã‚Œã‚‹ perl è£½ã‚¹ã‚¯ãƒªãƒ—ãƒˆãƒ„ãƒ¼ãƒ«ã§ã™ã€‚ ä¾‹ã¨ã—ã¦ä»¥ä¸‹ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã€database1 ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’ database2 ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ã‚¹ã‚ãƒ¼ãƒžã«è¿½å¾“ã™ã‚‹ ALTER SQL ãŒç”Ÿæˆã•ã‚Œã¾ã™ã€‚DB ã‚¹ã‚ãƒ¼ãƒžã®æ›´æ–°ã«ä¾¿åˆ©ã§ã™ã€‚ mysqldiff -u user -p password -i database1 database2 ã“ã®ãƒ„ãƒ¼ãƒ«ã®ãƒ¡ãƒªãƒƒãƒˆã¯ãƒ•ãƒ¬ãƒ¼ãƒ ãƒ¯ãƒ¼ã‚¯ã«ä¾å˜ã—ãªã„ã‚¹ã‚¿ãƒ³ãƒ‰ã‚¢ãƒãƒ³ãªã‚¹ã‚¯ãƒªãƒ—ãƒˆã§ã‚ã‚‹ã“ã¨ã ã¨æ€ã„ã¾ã™ã€‚ãƒ‡ãƒ¡ãƒªãƒƒãƒˆã¯æœ€è¿‘ã® MySQL ã®æ©Ÿèƒ½ã«å¯¾å¿œã—ã¦ã„ãªã‹ã£ãŸã‚Šã™ã‚‹ã“ã¨ã ã¨æ€ã„ã¾ã™ã€‚ä¾‹ãˆã° PARTITION ã«ã¯å¯¾å¿œã—ã¦ã„ã¾ã›ã‚“ã€‚ä¸èº«
kiyo_hiko 2016/06/01
mysql

diff

tool

perl
ãƒªãƒ³ã‚¯
ä»•æ§˜å¤‰æ›´ã®ç®¡ç†ã¨å¯¾å¿œï½œã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢é–‹ç™ºã‚„Webã‚µã‚¤ãƒˆæ§‹ç¯‰ã§ç™ºç”Ÿã™ã‚‹ä»•æ§˜å¤‰æ›´ã®ç®¡ç†ãƒ»å¯¾ç–æ–¹æ³•ã€‚
ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã¨é€£å‹•ã—ãŸå„ç¨®Webã‚µã‚¤ãƒˆæ§‹ç¯‰ã€‚ãƒ¢ãƒã‚¤ãƒ«ãƒ»æºå¸¯ã‚µã‚¤ãƒˆã‚‚å¯¾å¿œã€‚3ã‚ãƒ£ãƒªã‚¢ã®å…¬å¼ã‚µã‚¤ãƒˆå®Ÿç¸¾ã‚ã‚Šã€‚ ä¸€äººã§ã¯ã™ã¹ã¦ã®æŠ€è¡“ã‚’ã‚«ãƒãƒ¼ã—ãã‚Œãªã„æ™‚ä»£ã€‚ã„ã‚ã„ã‚ãªåˆ†é‡Žã®ã‚¹ãƒšã‚·ãƒ£ãƒªã‚¹ãƒˆãŒ ãƒŽã‚¦ãƒã‚¦ã‚’æ´»ã‹ã—ã¦ã‚³ãƒ©ãƒœãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãƒ»ãƒãƒ¼ãƒ ã¨ã—ã¦æ¥å‹™ã‚’è«‹ã‘è² ã„ã¾ã™ã€‚ ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢é–‹ç™ºã‚’ã™ã‚‹ä¸Šã§å¿…ãšå¿…è¦ã¨ãªã‚‹ã€Œä»•æ§˜ã€ã€‚ ä»•æ§˜ã¨ã¯ã€ã©ã®æ§˜ãªä»•çµ„ã¿ã§ãƒ»ã©ã®æ§˜ãªæ©Ÿèƒ½ã‚’ãƒ»ã©ã†ã„ã†ç’°å¢ƒã§æ§‹ç¯‰ã™ã‚‹ã®ã‹ã¨ã„ã£ãŸè¨è¨ˆæ›¸ã«ã‚ãŸã‚Šã¾ã™ã€‚ è¨è¨ˆãŒå„ªç§€ã§ã‚ã‚Œã°ä¿®æ£ã«ã‚‚å¼·ãã€é–‹ç™ºæœŸé–“ã‚‚çŸç¸®ãŒå‡ºæ¥ã‚‹ã»ã©ã®é‡è¦ãªã‚‚ã®ã§ã™ã€‚ ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢é–‹ç™ºã®ç¾å ´ã§ã¯ä»•æ§˜ã®å¤‰æ›´ãŒå¿…ãšç™ºç”Ÿã—ã¾ã™ã€‚ã‚‚ã£ã¨è‰¯ã„ã‚‚ã®ã‚’ãƒ»ã‚‚ã£ã¨ä¾¿åˆ©ãªã‚‚ã®ã‚’ã¨è¿½æ±‚ã—ãŸçµæžœã€Œæ©Ÿèƒ½ã®è¿½åŠ ã€ã‚„ã€Œä»•æ§˜ã®å¤‰æ›´ã€ã¨ã„ã†å½¢ã§é–‹ç™ºå´ã«è¦‹ãˆã¦ãã¾ã™ã€‚ ãƒ¦ãƒ¼ã‚¶ã‹ã‚‰è¦‹ãŸä»•æ§˜å¤‰æ›´ã¯ã•ã‚‰ã«ä¾¿åˆ©ã«ãªã‚‹æ“è¿Žã•ã‚Œã‚‹ã‚‚ã®ã€‚SEã‚„ãƒ—ãƒã‚°ãƒ©ãƒžãƒ¼ã‹ã‚‰ã¯â€çµ‚ã‚ã‚‰ãªã„ä»•äº‹â€ã«ãªã‚Šå¾—ã‚‹ã‚„ã£ã‹ã„ãªå˜åœ¨ã§ã‚‚ã‚ã‚Šã¾ã™ã€‚ ä»•æ§˜å¤‰æ›´ã¯
kiyo_hiko 2016/04/13
ã†ãƒ¼ã‚“â€¦

ä»•æ§˜å¤‰æ›´

diff

management
ãƒªãƒ³ã‚¯
Kirishiki Studios
äº‹æ¥å†…å®¹ å€‹äººäº‹æ¥ä¸»ã¨ã—ã¦ã€ã‚¦ã‚§ãƒ–ã‚·ã‚¹ãƒ†ãƒ ãƒ»ã‚¦ã‚§ãƒ–ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã®é–‹ç™ºãƒ»é‹ç”¨ï¼ˆå—è¨—ï¼‰ã‚’è¡Œã£ã¦ã„ã¾ã™ã€‚ è‡ªå·±ç´¹ä»‹ åå‰: å±±ç”°ç›´è¡Œ(Naoyuki YAMADA) å±‹å·: éœ§æ•·ã‚¹ã‚¿ã‚¸ã‚ª(Kirishiki Studios) ãƒãƒ³ãƒ‰ãƒ«ãƒãƒ¼ãƒ : hanputu Github Twitter Blog Blog(old) Note Facebook LinkedIn SlideShare SpeakerDeck YOUTRUST å‹¤å‹™å…ˆ/å–å¼•å…ˆ(2024å¹´6æœˆæ™‚ç‚¹) æ ªå¼ä¼šç¤¾ãƒŠã‚¤ãƒ«ãƒ¯ãƒ¼ã‚¯ã‚¹(æ£ç¤¾å“¡) ãƒ‰ãƒãƒ¼ãƒ³é–‹ç™ºéƒ¨ ã‚·ãƒ‹ã‚¢ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ æ ªå¼ä¼šç¤¾ã‚µã‚¤ãƒãƒ¼ã‚¨ãƒ¼ã‚¸ã‚§ãƒ³ãƒˆ(æ¥å‹™å§”è¨—) AILab çµŒæ¸ˆå¦ç¤¾ä¼šå®Ÿè£…ãƒãƒ¼ãƒ ãƒªã‚µãƒ¼ãƒã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ ä»– æ¥å‹™å§”è¨— 1ç¤¾ èˆˆå‘³ãƒ»ã‚¹ã‚ãƒ« ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰å¯„ã‚Šã®ã‚¦ã‚§ãƒ–ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚¨ãƒ³ã‚¸ãƒ‹ã‚¢ã€‚ å°ã•ãªé–‹ç™ºãƒãƒ¼ãƒ ã§ã®ç«‹ã¡ä¸Šã’ã‹ã‚‰é•·æœŸã®é‹ç”¨ã¾ã§ã€ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒ“ã‚¹ã®é–‹ç™ºéŽç¨‹å…¨èˆ¬ã«èˆˆå‘³
kiyo_hiko 2016/04/13
mysql

workbench

db

schema

diff

alter

è‡ªå‹•åŒ–
ãƒªãƒ³ã‚¯
git diffã§ãƒ–ãƒ©ãƒ³ãƒé–“ã®ãƒ•ã‚¡ã‚¤ãƒ«å·®åˆ†ã‚’ç¢ºèªã™ã‚‹ã‚ã‚Œã“ã‚Œ
EasyRamble ã¯ã€æŠ€è¡“ãƒã‚¿ã‚„åè‚²ã¦ã€è‹±èªžå¦ç¿’ã€ã‚¢ã‚¦ãƒˆãƒ‰ã‚¢ãªã©ã«ã¤ã„ã¦ç¶´ã‚‹ãƒ–ãƒã‚°ã§ã™ã€‚Ruby on Rails ã‚„ Swift ãªã©ã§ã€Webã‚µãƒ¼ãƒ“ã‚¹/ã‚¢ãƒ—ãƒªã‚’ä½œã£ã¦ã„ã¾ã™ã€‚
kiyo_hiko 2016/03/17
$ git diff --name-only branch-a branch-bã§ç‰¹å®šã®ãƒ–ãƒ©ãƒ³ãƒaã¨bã§å¤‰æ›´ãŒã‚ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚²ãƒƒãƒˆ

git

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

tips

diff

std
ãƒªãƒ³ã‚¯
transitive.info - git diff ä½¿ã„æ–¹
git diff ä½¿ã„æ–¹ ãƒ¯ãƒ¼ã‚¯ãƒ„ãƒªãƒ¼ã¨ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã®å·®åˆ†ã‚’è¡¨ç¤ºã™ã‚‹ git diff ã¨ã™ã‚‹ã¨ãƒ¯ãƒ¼ã‚¯ãƒ„ãƒªãƒ¼ã¨ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã‚‹ã€‚ ãƒ¯ãƒ¼ã‚¯ãƒ„ãƒªãƒ¼ã¨ HEAD ã®å·®åˆ†ã‚’è¡¨ç¤ºã™ã‚‹ ç¾åœ¨ã®ãƒ¯ãƒ¼ã‚¯ãƒ„ãƒªãƒ¼ãŒæœ€å¾Œã®ã‚³ãƒŸãƒƒãƒˆã‹ã‚‰ã©ã®ã‚ˆã†ã«ç·¨é›†ã•ã‚ŒãŸã‹ã‚’èª¿ã¹ã‚‹ã«ã¯ git diff HEAD ã¨ã™ã‚‹ã€‚ ç‰¹å®šã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å·®åˆ†ã‚’è¡¨ç¤ºã™ã‚‹ ã€Œgit diffã€ã®å¾Œã«ãƒ‘ã‚¹ã‚’æŒ‡å®šã™ã‚Œã°ã‚ˆã„ã€‚ ã“ã®ã¨ãã«ã€ã€Œgit diffã€ã®å¾Œã«ã‚³ãƒŸãƒƒãƒˆã‚’æŒ‡å®šã—ã¦ã„ã¦ ã†ã¾ãã„ã‹ãªã„ã‚ˆã†ãªå ´åˆã¯ã€ã€Œâ€“ã€ã‚’ã¯ã•ã‚€ã€‚ ãŸã¨ãˆã°ã€file1.txtã€file2.txt ã®å·®åˆ†ã‚’è¡¨ç¤ºã™ã‚‹ã«ã¯ git diff file1.txt file2.txt git diff -- file1.txt file2.txt ã¨ã™ã‚‹ã€‚ ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã¨ HEAD ã®å·®åˆ†ï¼ˆæ¬¡ã«ã‚³ãƒŸãƒƒãƒˆã™ã‚‹å·®åˆ†ï¼‰ã‚’è¡¨ç¤ºã™ã‚‹ æ¬¡ã«ã‚³ãƒŸãƒƒãƒˆã™ã‚‹å†…å®¹ã‚’è¡¨ç¤ºã™ã‚‹ã«ã¯ã€Œâ€“
kiyo_hiko 2015/01/15
git

diff
ãƒªãƒ³ã‚¯
Git ã® diff ã‚’ç¾Žã—ãè¡¨ç¤ºã™ã‚‹ãŸã‚ã«å¿…è¦ãªãŸã£ãŸ 1 ã¤ã®è¨å®š #git - è©©ã¨å‰µä½œãƒ»æ€ç´¢ã®ã²ã‚ã°
Git ã«åŒæ¢±ã•ã‚Œã¦ã„ã‚‹ contrib/diff-highlight ã‚’ä½¿ã„ã¾ã™ã€‚ ã‚ã¨ã¯ README ã«æ›¸ã„ã¦ã‚ã‚‹ã“ã¨ã®å¼•ãå†™ã—ã§ã™ãŒã€PATH ã®é€šã£ãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ç½®ã„ã¦ã€~/.gitconfig ã«ä»¥ä¸‹ã®ã‚ˆã†ã«è¨å®šã‚’æ›¸ãã€‚ [pager] log = diff-highlight | less show = diff-highlight | less diff = diff-highlight | less ã™ã‚‹ã¨ã€å¯¾å¿œã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã®å‡ºåŠ›ãŒã“ã‚“ãªé¢¨ã«ãªã‚Šã¾ã™ã€‚ è¡Œãƒ¬ãƒ™ãƒ«ã® diff ã«åŠ ãˆã¦ã€å˜èªžãƒ¬ãƒ™ãƒ«ã§ã® diff ã‚‚ãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã‚Œã€GitHub ã§ã® diff ã®ã‚ˆã†ã«æç”»ã•ã‚Œã¾ã—ãŸã€‚ çµ„ã¿è¾¼ã¿ã®ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã§ --color-words ã¨ã„ã†ã®ãŒã‚ã‚Šã¾ã™ãŒã€ã“ã¡ã‚‰ã‚’ä½¿ã†ã¨è¡Œãƒ¬ãƒ™ãƒ«ã® diff æƒ…å ±ãŒå¤±ã‚ã‚Œã‚‹ã®ã§ã€å°‘ã—ä¸ä¾¿ã ã£ãŸã‚ã‘ã§ã™ãã€‚ã¨ã™ã¹ã¦ README ã«æ›¸ã„ã¦ã‚
kiyo_hiko 2013/11/26
git

diff

tips
ãƒªãƒ³ã‚¯
git difftool --dir-diff ãŒä¾¿åˆ©ã™ãŽã¦æ³£ããã†ã§ã™
Git ã® 1.7.11 ã‹ã‚‰ git difftool ã‚³ãƒžãƒ³ãƒ‰ã« --dir-diff ã¨ã„ã†ã‚ªãƒ—ã‚·ãƒ§ãƒ³ãŒè¿½åŠ ã•ã‚ŒãŸã®ã§ã™ãŒã€ã“ã‚ŒãŒãƒ©ã‚¤ãƒ• ãƒã‚§ãƒ³ã‚¸ãƒ³ã‚°ã ã¨æ€ã£ãŸã®ã§ç´¹ä»‹ã—ã¾ã™ã€‚ --dir-diff ç™»å ´ä»¥å‰ã® git difftool ã¯ã€Œãƒ•ã‚¡ã‚¤ãƒ«ã”ã¨ã«é †ç•ªã«å·®åˆ†ã‚’è¡¨ç¤ºã—ã¦ã„ãã€ã“ã¨ã—ã‹ã§ããšã€ä½¿ã„å‹æ‰‹ã¯ã„ã¾ã„ã¡ã§ã—ãŸã€‚ãã‚ŒãŒã€--dir-diff ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã®ç™»å ´ã§çŠ¶æ³ãŒä¸€å¤‰ã—ãŸã‚ã‘ã§ã™ã€‚ ã“ã‚“ãªæ„Ÿã˜ã®ä½¿ã„å¿ƒåœ°ã ã‚ˆ ã‚ã‚‹ Git ãƒ¬ãƒã‚¸ãƒˆãƒªãƒ¼ã§ dir1/a.txt ã¨ dir2/c.txt ã‚’ç·¨é›†ã—ãŸã¨ã—ã¾ã—ã‚‡ã†ã€‚ ã“ã®çŠ¶æ…‹ã§ git difftool --dir-diff ã¾ãŸã¯ git difftool -d ã‚’å®Ÿè¡Œã—ã¦ã¿ã‚‹ã¨ãƒ»ãƒ»ãƒ»ã€‚ ã¯ã„ã€å·®åˆ†ã®ã‚ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ãŒä¸€è¦§ã§è¡¨ç¤ºã•ã‚Œã¾ã—ãŸã€‚ (difftool ã« WinMerge ã‚’è¨å®šã—ã¦ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰ [ãƒ„ãƒªãƒ¼è¡¨ç¤º] ã‚’æœ‰åŠ¹
kiyo_hiko 2013/07/07
git

diff

tips
ãƒªãƒ³ã‚¯
1 2 æ¬¡ã®ãƒšãƒ¼ã‚¸