How to compare two files not in repo using git
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
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.
will give similar unified context output to git's diff.