diff

在看<<version control with git >> 时偶然发现里面提到的一个GNU tool--GNU diff,好吧,其实我比较山，不知道上面这个这么好用的工具。

跟git diff 的比较

Administrator@PC-NAME ~/Desktop/ssh/repos/test (master)
$ echo 'hello' > test
Administrator@PC-NAME ~/Desktop/ssh/repos/test (master)
$ git add .
warning: LF will be replaced by CRLF in test.
The file will have its original line endings in your working directory.
Administrator@PC-NAME ~/Desktop/ssh/repos/test (master)
$ echo 'hello world' > test
Administrator@PC-NAME ~/Desktop/ssh/repos/test (master)
$ git diff
diff --git a/test b/test
index ce01362..3b18e51 100644
--- a/test
+++ b/test
@@ -1 +1 @@
-hello
+hello world
warning: LF will be replaced by CRLF in test.
The file will have its original line endings in your working directory.

GNU diff 比较两个文件的不同(self-explanation)

[root@HOSTNAME ~]# echo 'hello' >test
[root@HOSTNAME ~]# echo 'hello world' > test2
[root@HOSTNAME ~]# diff -u test test2
--- test        2012-01-26 01:56:07.000000000 +0800
+++ test2       2012-01-26 01:56:28.000000000 +0800
@@ -1 +1 @@
-hello
+hello world

Reference :

<<version control with git >>.chapter 6.git diff