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

U1and0 id:U1and0

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

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

git diffã§docx, pptx, xlsxã®ãƒ†ã‚ã‚¹ãƒˆå·®åˆ†ã‚’ç¢ºèªã§ãã‚‹ã‚ˆã†ã«ã™ã‚‹ | takemikami's note
2019/04/01 xlsxã®å·®åˆ†è¡¨ç¤ºã‚‚è¿½è¨˜ã—ã¾ã—ãŸ git diffã§ã€ Word, PowerPoint, Excelã®ãƒ†ã‚ã‚¹ãƒˆå·®åˆ†ã‚’ç¢ºèªã§ãã‚‹ã‚ˆã†ã«ã™ã‚‹ãŸã‚ã®è¨å®šæ‰‹é †ã‚’ã¾ã¨ã‚ã¾ã—ãŸã€‚ macosç”¨ã®æ‰‹é †ã§ã™ã€‚ æ–¹æ³•ã¯ä»¥ä¸‹ã®ãƒ–ãƒã‚°è¨˜äº‹ã§æ›¸ã‹ã‚Œã¦ã„ã‚‹å†…å®¹ã¨åŒã˜ã§ã™ãŒã€ dotfilesã§ç®¡ç†ã™ã‚‹ã“ã¨ã‚’æƒ³å®šã—ã€ãƒ¦ãƒ¼ã‚¶å˜ä½ã«è¨å®šã—ã¦ã„ã¾ã™ã€‚ MS Wordã§æ›¸ã‹ã‚ŒãŸåŽŸç¨¿ã‚’ãƒ†ã‚ã‚¹ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã§Gitç®¡ç†ã™ã‚‹ | Fuzokuå®Ÿè·µå…¥é–€ãƒ–ãƒã‚° http://learning-fuzoku.hatena blog.com/entry/2015/03/10/183954 å¿…è¦ãªãƒ„ãƒ¼ãƒ«ã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«docxãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ãƒ†ã‚ã‚¹ãƒˆã‚’å‡ºåŠ›ã™ã‚‹ãŸã‚ã€docx2txtã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã€‚ brew install docx2txt pptxãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ãƒ†ã‚ã‚¹ãƒˆã‚’å‡ºåŠ›ã™ã‚‹ãŸã‚ã€pptx2txtã‚’ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã€‚ mkdir
U1and0 2021/01/09
diff

git
ãƒªãƒ³ã‚¯
fugitive.vim ãŒä¾¿åˆ©ã™ãŽãŸã®ã§ãƒ¡ãƒ¢ - åçœã¯ã—ã¦ã‚‚å¾Œæ‚”ã¯ã—ãªã„
Vim ã‹ã‚‰ Git ã‚’æ“ä½œã™ã‚‹ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¨ã—ã¦ã¯ã€ä»Šã¾ã§ git.vim ã‚’ä½¿ã£ã¦ã„ãŸã‚“ã§ã™ãŒã€fugitive.vim ã®ã»ã†ãŒä¾¿åˆ©ã ã£ãŸã®ã§ä¹—ã‚Šæ›ãˆã¾ã—ãŸã€‚ è©³ã—ã„èª¬æ˜Žã¯ã“ã“ VimmerãªGitä½¿ã„ã¯fugitive.vimã‚’ä»Šã™ãå…¥ã‚ŒãŸã»ã†ãŒã„ã„ - SELECT * FROM life; ã“ã“ã§ã¯ã€è‡ªåˆ†ãŒç‰¹ã«ä¾¿åˆ©ã ã¨æ€ã£ãŸæ©Ÿèƒ½ã‚’æ›¸ãã¾ã™ã€‚ git add -p ã‚’ã‚°ãƒ©ãƒ•ã‚£ã‚«ãƒ«ã«è¡Œã† git add -p ã‚’ä½¿ã†ã¨ã€è¤‡æ•°ã®å¤‰æ›´ç®‡æ‰€ã®ã†ã¡ã©ã®å¤‰æ›´ã‚’ã‚³ãƒŸãƒƒãƒˆã«å«ã‚ã‚‹ã‹ã‚’é¸ã¶ã“ã¨ãŒã§ãã¾ã™ãŒã€fugitive ã® :Gdiff ã‚’ä½¿ã†ã¨ã“ã‚Œã‚’ã‚°ãƒ©ãƒ•ã‚£ã‚«ãƒ«ã«è¡Œã†ã“ã¨ãŒã§ãã¾ã™ã€‚ :Gdiff ã‚³ãƒžãƒ³ãƒ‰ã¯ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã¨ãƒ¯ãƒ¼ã‚¯ãƒ„ãƒªãƒ¼ã®çŠ¶æ…‹ã®å·®åˆ†ã‚’ vim ã® diff ã§è¡¨ç¤ºã—ã¾ã™ã€‚ ã“ã‚“ãªæ„Ÿã˜ ãŸã¨ãˆã°ã€ã‚¹ã‚¿ã‚¤ãƒ«ã‚·ãƒ¼ãƒˆã®è¨å®šï¼ˆä¸Šã®ã»ã†ã®å·®åˆ†ï¼‰ã¯ã‚³ãƒŸãƒƒãƒˆã«å«ã‚ãŸã„ã‘ã©ã€ã‚¯ãƒ©ã‚¹å±žæ€§ã®ä»˜ä¸Žï¼ˆä¸‹ã®
U1and0 2018/11/12
diff

vim

git

fugitive
ãƒªãƒ³ã‚¯
Microsoft Word + pandoc + git ã«ã‚ˆã‚‹ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆç®¡ç† - Qiita
ãªãœä¿ºãŸã¡ã¯ã“ã‚“ãªã“ã¨ã‚’ã—ãªã‘ã‚Œã°ãªã‚‰ãªã„ã®ã‹ è‹¦ã—ã¿ ã¯ã˜ã‚ã« Word ãŒã‚ã£ãŸ Word ã¯å®¢ã¨å…±ã«ã‚ã£ãŸ Word ã¯ç¥žã§ã‚ã£ãŸ .docx è‡ªä½“ã¯ãŸã ã® zip ãƒ•ã‚¡ã‚¤ãƒ«ã§ã€è§£å‡ã™ã‚Œã° xml ç‰ãŒå¾—ã‚‰ã‚Œã‚‹ã®ã ãŒã€ãã‚Œã‚‰ã¯è§£èªã—ãŒãŸãã€å¤‰æ›´å·®åˆ†ã®ç®¡ç†ãªã©ã¯è‹¦ã—ã¿ãŒã‚ã‚‹ git ã®ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆã§ã‚‚åŒã˜è‹¦ã—ã¿ã«ã¤ã„ã¦è¨€åŠã•ã‚Œã¦ã„ã‚‹ 8.2 Git ã®ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚º - Git ã®å±žæ€§ ã“ã“ã§ã¯ git ã® textconv ãŒç”¨ã„ã‚‰ã‚Œã¦ã„ã‚‹ textconv ã‚’ä½¿ã†ã¨ã€ç”Ÿãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ãªãã€ãã‚Œã‚‰ã‚’æŒ‡å®šã®ã‚³ãƒžãƒ³ãƒ‰ã«ä¸ŽãˆãŸçµæžœ(ã¨ã—ã¦å‡ºåŠ›ã•ã‚Œã‚‹ãƒ†ã‚ã‚¹ãƒˆ)ã‚’ diff ã«æ¸¡ã™ã‚‹ã“ã¨ãŒã§ãã‚‹ ãã“ã§ã€docx2txt ã¨ã„ã†.docxã‚’ãƒ†ã‚ã‚¹ãƒˆå¤‰æ›ã™ã‚‹ã‚¹ã‚¯ãƒªãƒ—ãƒˆã‚’ textconv ã«å®šç¾©ã™ã‚‹ã“ã¨ã§ãƒ†ã‚ã‚¹ãƒˆã®å·®åˆ†ã‚’å¾—ã¦ã„ã‚‹ Mac ãªã‚‰ã°ã€æ¨™æº–ã® textutil ã‚’ä½¿ã„åŒæ§˜ã®äº‹ãŒã§ãã‚‹ã ã‚ã†
U1and0 2018/05/03
word

diff

git

markdown
ãƒªãƒ³ã‚¯
How do I show the changes which have been staged?
I staged a few changes to be committed. How do I see the diffs of all files which are staged for the next commit? Is there a handy one-liner for this? git status only shows names of files which are staged, but I want to see the actual diffs. The git-diff(1) man page says: git diff [--options] [--] [â€¦] This form is to view the changes you made relative to the index (staging area for the next commit
U1and0 2018/03/18
For showing staged chande, use `git diff --cached`

git

diff

--cached
ãƒªãƒ³ã‚¯
ãƒ†ã‚ã‚¹ãƒˆãƒ•ã‚¡ã‚¤ãƒ«å·®åˆ†è¡¨ç¤ºãƒ„ãƒ¼ãƒ«ã€ŒWinMerge æ—¥æœ¬èªžç‰ˆã€v2.14.0+-jp-135ãŒå…¬é–‹
U1and0 2017/05/31
ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆ

Windows

diff
ãƒªãƒ³ã‚¯
ã€Gitã€‘stashã—ãŸå†…å®¹ã‚’diffè¡¨ç¤ºã™ã‚‹ - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
U1and0 2016/09/14
git

qiita

diff
ãƒªãƒ³ã‚¯
gitã®diff, status, logã‚’æ¥µé™ã¾ã§ã‚³ãƒ³ãƒ‘ã‚¯ãƒˆåŒ–ï¼‹ä¾¿åˆ©åŒ–ã™ã‚‹ - Qiita
Deleted articles cannot be recovered. Draft of this article would be also deleted. Are you sure you want to delete this article?
U1and0 2016/09/06
git

diff

alias

log
ãƒªãƒ³ã‚¯
ã€gitã€‘git diff ã‚’ã™ã‚‹ã¨æ”¹è¡Œã« ^M ãŒè¡¨ç¤ºã•ã‚Œã‚‹ - æ—…ã™ã‚‹ãˆã‚“ã˜ã«ã‚ - Engineers to Travel -
ã‚ã‚‹ã¨ãgit diffã§ã‚³ãƒ¼ãƒ‰ã®å·®åˆ†ã‚’è¦‹ã¦ã„ã‚‹ã¨ã å¤‰æ›´ç®‡æ‰€ã®æ”¹è¡Œã«ã€ŒMã€ã¨ã¤ã„ã¦ã„ã‚‹ã®ã‚’ç™ºè¦‹ã—ãŸã€‚ ã“ã‚Œã¯æ°—æŒã¡æ‚ªã„ã€‚ æœ€åˆã«ç–‘ã£ãŸã®ã¯ãƒ†ã‚ã‚¹ãƒˆã‚¨ãƒ‡ã‚£ã‚¿ Sublime Text 2 ã‚’ä½¿ã£ã¦ã„ã‚‹ã®ã ã‘ã©ã€æœ€è¿‘è¨å®šã‚’ã„ã˜ã£ãŸè¦šãˆã¯ãªã„ã€‚ â€»ã¡ãªã¿ã«è¨å®šã¯LFã«ãªã£ã¦ã„ã‚‹ è¦ç´„é€šã‚Šã«ã—ã¦ã„ã‚‹ã®ã«ãªãœã€‚ã€‚ã€‚ èª¿ã¹ãŸçµæžœ å‰ã« ã€gitã€‘aliasã‚’ä½¿ã£ã¦ã‚³ãƒžãƒ³ãƒ‰ã‚’çŸãã™ã‚‹ - æ—…ã™ã‚‹ãˆã‚“ã˜ã«ã‚ - Engineers to travel - ã§è¨˜è¿°ã—ãŸ [color] diff = auto status = auto branch = auto ã“ã“ã®diff = autoãŒæ‚ªã•ã‚’ã—ã¦ã„ã‚‹ã¨ã®ã“ã¨ã€‚ å¯¾å¿œç–ã¨ã—ã¦whitespaceã«è¡Œæœ«ã®ã‚ãƒ£ãƒªãƒƒã‚¸ãƒªã‚¿ãƒ¼ãƒ³ã‚’è¨±å®¹ã™ã‚‹ã¨è§£æ±ºã§ãã‚‹ã‚ˆã†ã§ã™ã€‚ ã¨ã„ã†ã“ã¨ã§ ã‚³ãƒžãƒ³ãƒ‰ã‹ã‚‰ã®å ´åˆã¯ git config --global core.whites
U1and0 2016/09/04
ã‚³ãƒžãƒ³ãƒ‰ã‹ã‚‰ã®å ´åˆã¯ git config --global core.whitespace cr-at-eol è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’å¼„ã‚‹ã®ã§ã‚ã‚Œã° [core] whitespace = cr-at-eol ä¸Šè¨˜ã‚’è¿½åŠ ã™ã‚‹ã¨è¡¨ç¤ºã•ã‚Œãªããªã‚‹ã€‚

setting

git

diff
ãƒªãƒ³ã‚¯
1