git diff 对比区别
- 直接输入
git diff 后面不跟某个文件，即显示出所有文件的区别
-
git diff index.html 表示单独查看 index.html 文件的区别， - 表示上个版本的修改， + 表示当前修改后的
diff --git a/index.html b/index.html
index aa8038f..6acd0f2 100644
--- a/index.html
+++ b/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="en">
+<html lang="zh-hans">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
git add index.html 把 index.html 文件添加到暂存区
-
git status 显示当前要提交的修改
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: index.html
-
git diff 查看区别，现在没有新的修改显示，因为我们把 index.html 文件添加到了暂存区，它会跟工作目录里的文件进行比较
- 此时修改一下
index.html 保存
-
git status 查看修改后文件的状态
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: index.html
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: index.html
-
git diff index.html 此时又会对比出上次修改的区别
diff --git a/index.html b/index.html
index 6acd0f2..239d8d4 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
- <title>Document</title>
+ <title>git diff</title>
</head>
<body>
