[英]'git difftool --dir-diff commit-id' giving error
I am using diffuse as a diff
tool over Linux, but when I use the git command 我在Linux上使用diffuse作为
diff
工具,但是当我使用git命令时
$ git difftool --dir-diff
for opening the modified files in a directory, I get the following error : 在目录中打开修改后的文件时,出现以下错误:
Error processing argument "/tmp/git-difftool.nUMQD7/left/". Directory not expected.
The same error is seen even if I use $git difftool --dir-diff commit-id^!
即使我使用
$git difftool --dir-diff commit-id^!
也会看到相同的错误$git difftool --dir-diff commit-id^!
. 。 can anyone please let me know what is the issue here?
有人可以让我知道这里的问题吗? If I use
$git difftool file1
where file1 is one of the modified files, it works perfectly fine and opens the graphical diff. 如果我使用
$git difftool file1
,其中file1是已修改的文件之一,则它可以很好地工作并打开图形差异。 But I would like to open the graphical diff for all the modified files. 但我想为所有修改后的文件打开图形差异。 Please let me know how can I do that.
请让我知道我该怎么做。
The diff tool that your git uses probably doesn't support recursive comparison. 您的git使用的diff工具可能不支持递归比较。 What is in your .gitconfig , by the line diff ?
您的.gitconfig中的diff行是什么? (probably diffuse )
(可能是分散的 )
Configure your diff tool to be able to use a recursive directory comparison command. 配置您的差异工具 ,使其能够使用递归目录比较命令。
What are the best diff tools for Git? 什么是Git最好的差异工具? use Kdiff3 or Meld, they are great IMO.
使用Kdiff3或Meld,它们是很棒的IMO。
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.