$ cd testGit/
$ ls
first.txt second.txt
$ git log --oneline
9c88fb7 add second lines to 1st & 2nd files
9c3da6c add 1st & 2nd files
$ git diff 9c88fb7 9c3da6c first.txt
warning: LF will be replaced by CRLF in first.txt.
The file will have its original line endings in your working directory.
diff --git a/first.txt b/first.txt
index 4a0143f..9c59e24 100644
--- a/first.txt
+++ b/first.txt
@@ -1,2 +1 @@
first
-first2
$ git difftool HEAD HEAD~1
/git/2.5.3/git-core/mergetools/winmerge: line 124: /c/Program Files (x86)/WinMerge/WinMergeU.exe: No such file or directory
/git/2.5.3/git-core/mergetools/winmerge: line 124: /c/Program Files (x86)/WinMerge/WinMergeU.exe: No such file or directory我已将红帽子驱动器安装到Z:/testGit/。
问题,我可以使用winmerge对这两次提交(即9c88fb7 9c3da6c)进行比较吗?
发布于 2016-01-13 15:45:18
WinMerge是在Windows环境下开发的。
WinMerge是一个用于Windows的开源差分和合并工具。
另外:
支持Microsoft Windows 2000/XP/2003/Vista/2008/7/8/2012
下面是一个链接到Linux的替代diff工具的站点:http://www.linuxalt.com/linux-alternatives-to/windows/winmerge.html
https://stackoverflow.com/questions/34770818
复制相似问题