A textconv, by comparison, is much more limiting. You provide a transformation of the data into a line-oriented text format, and Git uses its regular diff tools to generate the output.简单地说, textconv 仅适用于常规git diff,不适用于 difftool .Simply put, textconv only works for the regular git diff, not for difftool.要使 difftool 工作,请将以下内容放入$ HOME/.gitconfig:To make difftool work, put the below into $HOME/.gitconfig:[difftool "docx"] cmd = t1=`mktemp` && `pandoc -t plain $LOCAL >$t1` && t2=`mktemp` && `pandoc -t plain $REMOTE >$t2` && meld $t1 $t2 && rm -f $t1 $t2现在您可以运行:$ git difftool --tool docx以上使用 pandoc 将docx转换为文本,并使用 melt 作为外部差异.The above uses pandoc for docx to text conversion and meld as an external diff. 这篇关于git difftool可以用于二进制文件吗?如果是这样,如何配置它?的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持! 上岸,阿里云!
08-14 01:15