Git学习笔记（二）版本控制-优快云博客

笔记一里写了如何安装git,提交文件。

命令一git status命令,查看当前git状态

         [root@VM_189_160_centos talkcloud]# git status
        On branch master
        nothing to commit, working tree clean

在主分支上，没有任何提交。

修改xx文件

        [root@VM_189_160_centos talkcloud]# 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:   xx

no changes added to commit (use "git add" and/or "git commit -a")

文件已修改，但是还没有提交

命令二:git diff 查询修改

        [root@VM_189_160_centos talkcloud]# git diff xx
        diff --git a/xx b/xx
        index 3efbfc0..5b035d8 100644
        --- a/xx
        +++ b/xx
        @@ -1,2 +1,3 @@
         this is test git
         git is very good
        +now is back

从输出结果看，我们在新文件当中添加了git is very good

重复提交过程

git add xx

git commit -m "change xx"

命令三：git log

[root@VM_189_160_centos talkcloud]# git log
commit 61a93ffd9bd46e8c5c0f812979669b236132336b (HEAD -> master)
Author: xxx <xxx>
Date:   Wed Jun 27 18:51:52 2018 +0800

    add version

commit f97e2200b185fe48e2d5c093169849dede189f40
Author: xx <xxxx>
Date:   Wed Jun 27 18:49:45 2018 +0800

    change xx

commit 20b8057239d63f179ddda10c43dec3694c2936bf
Author: xx <xxx>
Date:   Wed Jun 27 18:42:22 2018 +0800

    wrote a test file

        每一个commit代表一个版本，git log命令显示从最近到最远的提交日志

PS：版本多的情况下，输出信息太多。可以加上--pretty=oneline参数

[root@VM_189_160_centos talkcloud]# git log --pretty=oneline
61a93ffd9bd46e8c5c0f812979669b236132336b (HEAD -> master) add version
f97e2200b185fe48e2d5c093169849dede189f40 change xx
20b8057239d63f179ddda10c43dec3694c2936bf wrote a test file

显示版本号与提交时的版本说明

版本回退：

命令四: git reset

回退到上一个版本 git reset --hard HEAD^

[root@VM_189_160_centos talkcloud]# git reset --hard HEAD^
HEAD is now at f97e220 change xx

回退到指定版本，git reset --hard 版本号前5位（写5位是因为git会自己找，写少了会有多个版本，写5位基本不会重复）