git教程-2

上次添加并提交文件

1、修改readme.txt文件内容

2、运行git status命令看看结果

$ git status                 //掌握仓库当前的状态
# On branch master
# 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:   readme.txt     //readme.txt文件被修改
#
no changes added to commit (use "git add" and/or "git commit -a")

3、看具体修改了什么内容

需要用git diff这个命令

$ git diff readme.txt       //查看difference，显示的格式正是Unix通用的diff格式
diff --git a/readme.txt b/readme.txt
index 46d49bf..9247db6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,2 +1,2 @@
-Git is a version control system.             //这里是未修改前
+Git is a distributed version control system. //这里是修改后
 Git is free software.      //这里没变化

4、提交至仓库

$ git add readme.txt

5、 运行 git status 看看当前仓库的状态 。(下面提示将要被提交的修改包括readme.txt)

$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       modified:   readme.txt
#

6、提交

$ git commit -m "add distributed"
[master ea34578] add distributed
 1 file changed, 1 insertion(+), 1 deletion(-)

7、 再用 git status 命令看看仓库的当前状态

$ git status
# On branch master
nothing to commit (working directory clean)   //当前没有需要提交的修改，而且，工作目录是干净（working directory clean）的

小结

• 要随时掌握工作区的状态，使用git status命令。

• 如果git status告诉你有文件被修改过，用git diff可以查看修改内容。