如何比较两个文件不在repo使用git [英] How to compare two files not in repo using git

问题描述

我想比较两个不在任何git存储库中的css文件。在git中是否有这样的功能？

I'd like to compare two css files which are not in any git repository. Is there such a functionality in git?

推荐答案

git 比标准unix diff 更具功能。

git's diff is more functional than the standard unix diff. I often want to do this and since this question ranks highly on google, I want this answer to show up.

这个问题：如何使用 git diff --color-words

显示如何使用git来区分文件，其中至少有一个文件不在存储库中，使用 - no-index ：

Shows how to use git to diff files where at least one of them is not in the repository by using --no-index:

git diff --no-index file1.txt file2.txt

git跟踪哪个文件并不重要，一个或两个可以未追踪，例如：

It doesn't matter which one is tracked by git and which is not - one or both can be untracked, eg:

$ date > x
$ sleep 2
$ date > y
$ git diff --color-words --no-index x y
diff --git a/x b/y
index 6b10c7c..70f036c 100644
--- a/x
+++ a/y
@@ -1 + 1 @@
Wed Jun 10 10:57:45|10:57:47 EDT 2013

颜色不能在这里显示，所以我在示例中用管道分隔了更改。

The color can't be shown here so I separated the changes with a pipe in the example.

这篇关于如何比较两个文件不在repo使用git的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！