git

git
git是版本控制器
git安装，在linux上，在Windows上
git简单使用
首先新安装的机器上要进行设置
git config --global user.name 'seven'
git config --global user.email 'sunshinea121@163.com'
然后在任意目录新建项目文件夹，并初始化文件夹
$ cd D:\empty
$ git init
Initialized empty Git repository in D:/empty/.git/
$ ll -a
total 8
drwxr-xr-x 1 xinyu.shi 1049089 0 5月 6 09:39 ./
drwxr-xr-x 1 xinyu.shi 1049089 0 5月 6 09:39 ../
drwxr-xr-x 1 xinyu.shi 1049089 0 5月 6 09:39 .git/
在文件夹内新家readme.txt文件，并提交到git分支
$ git add README.txt

xinyu.shi@NBJXINYU-SHI MINGW32 /d/empty (master)
$ git commit -m 'new file'
[master (root-commit) 88ee680] new file
1 file changed, 2 insertions(+)
create mode 100644 README.txt

查看状态，并修改再次提交
xinyu.shi@NBJXINYU-SHI MINGW32 /d/empty (master)
$ git status
On branch master
nothing to commit, working directory clean

xinyu.shi@NBJXINYU-SHI MINGW32 /d/empty (master)
$ git status
On branch master
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)

    modified:   README.txt

no changes added to commit (use "git add" and/or "git commit -a")
xinyu.shi@NBJXINYU-SHI MINGW32 /d/empty (master)
$ git commit -m 'add sistributed'
[master 9e3a8e4] add sistributed
1 file changed, 2 insertions(+), 1 deletion(-)

查看git提交日志，由近及远最后三次
$ git log
commit 9e3a8e498621c69c34b9a62b401e24b5b50792d8
Author: seven sunshinea121@163.com
Date: Mon May 6 09:44:13 2019 +0800

add sistributed

commit 88ee680a415e28bd1e2e23e9bc60f58416b5d7a0
Author: seven sunshinea121@163.com
Date: Mon May 6 09:41:57 2019 +0800

new file

返回到上一次提交，HEAD是当前版本，^是上一个版本 ，^^是上上一个版本。
xinyu.shi@NBJXINYU-SHI MINGW32 /d/empty (master)
$ git reset --hard HEAD^
HEAD is now at 88ee680 new file

返回到指定点
xinyu.shi@NBJXINYU-SHI MINGW32 /d/empty (master)
$ git reset --hard 9e3a8e49
HEAD is now at 9e3a8e4 add sistributed

查看命令历史
$ git reflog
9e3a8e4 HEAD@{0}: reset: moving to 9e3a8e49
88ee680 HEAD@{1}: reset: moving to HEAD^
9e3a8e4 HEAD@{2}: commit: add sistributed
88ee680 HEAD@{3}: commit (initial): new file

丢弃暂存区修改
git checkout -- README.txt
git reset HEAD README.txt