How to compare two files not in repo using git

git compare diff
Cedric Reichenbach picture Cedric Reichenbach · Jul 19, 2012 · Viewed 24.6k times · Source

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

Answer

Kyle Burton picture Kyle Burton · Jun 19, 2013

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.

This question: How to use git diff --color-words outside a Git repository?

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

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.

Related questions

Git: Compare All Local Commits to Remote Repo Version

I'm somewhat new to Git and what I'm trying to do seems like it should be possible. Basically I've been working off of clone of a repo and have made quite a few local commits. Is there a way to …

Read More
See exact divergence/commits between local and remote Git repo

Setup: 3 git repos - on github, local and on staging server. I develop locally, push it to github and staging server pulls. I don't work nor commit changes on staging server, but I must have done so long time ago. …

Read More
How to compare changesets in Git?

Git makes it very easy to compare differences between commits, using for instance the git commands diff and difftool. Also in TortoiseGit you just select two commits to compare them. But is there a way to compare changesets? In other …

Read More