git study of git diff command

Git diff:
You can generate differs in any two version of your project using the git diff
for example this sample will diff between two branch
点击(此处)折叠或打开

git diff master..experimental
diff --git a/file1 b/file1
deleted file mode 100644
index 8012e4c..0000000
--- a/file1
+++ /dev/null
@@ -1 +0,0 @@
-iiadfadfa
diff --git a/file2 b/file2
deleted file mode 100644
index 3b71a9a..0000000
--- a/file2
+++ /dev/null
@@ -1,4 +0,0 @@
-dnnnnnn
-adfa
diff --git a/file3 b/file3
deleted file mode 100644
index 8be9fd0..0000000
--- a/file3
+++ /dev/null
@@ -1,6 +0,0 @@
-annnnnnnnnnnnn

above will produce the differ in two branches if you would refer to find the diff from their common ancestor to test, you can use dots instead of two:

git diff master...test

what you will commit:

you will commonly use git diff to figuring out differences between your last commit, your index, your working directory, a common use is to simply run

git diff

which will show you changes in working directory that are not yet staged for the next commit, if you want to see what is staged for the next commit you can run

git diff –cached

also you can run git diff HEAD which shows changes in working directory since you last commit.

More diff options

if you want to see how you current working directory differs from the state of the project in another branch, you can run something like

git diff test

this will show you what is different between your current directory and the snapshot on the test branch

you can also limit the comparison to specific file and subdirectory by add a path limiter:

git diff HEAD – ./LIB