Git basic

Windows 下的安装



打开Gitbash，
在/c/Users//目录下也有一个
.gitconfig文件，可以直接修改该文件

$ git config --global user.name "clz"


$ git config --global user.email "[e-mail]"


$ git config --list
core.symlinks=false
core.autocrlf=true
core.fscache=true
color.diff=auto
color.status=auto
color.branch=auto
color.interactive=true
help.format=html
rebase.autosquash=true
http.sslcainfo=C:/PROG/Git/mingw64/ssl/certs/ca-bundle.crt
http.sslbackend=openssl
diff.astextplain.textconv=astextplain
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.smudge=git-lfs smudge -- %f
filter.lfs.required=true
filter.lfs.process=git-lfs filter-process
credential.helper=manager
user.name=clz
user.email=[e-mail]


$

$ ls
1122Tesst/ 20161116/ acm01_0503/ ADV/ ADV07/ aha0401/ aha0701/ bubble/ Readme.md
20160810/ 20170407Test/ acm01_0701/ ADV01/ ADV09/ aha0403/ aha0702/ CSDN/ Temp/
20160928/ 20170419adv/ acm02_0107/ ADV03/ adv09_simple_plate/ aha0404/ aha0703/ day02/ VSMacros80/
20160928adv/ 20170426adv/ acm02_0408/ ADV04/ aha_quicksort/ aha0410/ aha0804/ DijkstraCU/ 新建文件夹/
20161019/ 20170517adv/ acm02_0408-2/ ADV05/ aha0205/ aha0501/ AIC/ Intermediate/
20161026/ 20170524adv/ acm0301/ ADV06/ aha0206/ aha0602/ binary_tree_01/ Mac2Unix.c
git

$ git add Readme.md


$ git commit -m "add a readme file"
[master (root-commit) 1e0ebaf] add a readme file
 1 file changed, 1 insertion(+)
 create mode 100644 Readme.md


$

$ git init
Initialized empty Git repository in D:/VS_PROG/git_test/.git/


$ git status
On branch master

No commits yet

nothing to commit (create/copy files and use "git add" to track)


$ git add Readme.md


$ git commit -m "add a readme file"
[master (root-commit) 60826d5] add a readme file
 1 file changed, 1 insertion(+)
 create mode 100644 Readme.md


$ git status
On branch master
nothing to commit, working tree clean

//新建一个LICENSE文件

$ git status
On branch master
Untracked files:
  (use "git add ..." to include in what will be committed)

        LICENSE

nothing added to commit but untracked files present (use "git add" to track)


$ git add LICENSE


$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD ..." to unstage)

        new file:  LICENSE



$ git reset HEAD   //将最后一个文件返回到modified状态，也可以明确指定哪个文件


$ git status
On branch master
Untracked files:
  (use "git add ..." to include in what will be committed)

        LICENSE

nothing added to commit but untracked files present (use "git add" to track)


$ git add LICENSE


$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD ..." to unstage)

        new file:  LICENSE

//继续编辑LICENSE文件

$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD ..." to unstage)

        new file: LICENSE  //这个是暂存区的文件

Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git checkout -- ..." to discard changes in working directory)

        modified:  LICENSE  //这个是修改区的文件



$ git commit -m "add a license file"     //将暂存区的文件提交到仓库区
[master 585c29e] add a license file
 1 file changed, 8 insertions(+)
 create mode 100644 LICENSE


$ 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: LICENSE

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


$ git checkout -- LICENSE   //仓库区文件覆盖修改区文件，命令执行后修改区和仓库文件一致，所以work tree clean
//这是有危险的命令，要谨慎使用


$ git status
On branch master
nothing to commit, working tree clean

//再修改LICENSE文件

$ 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: LICENSE

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


$ git add LICENSE


$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD ..." to unstage)

        modified:  LICENSE

//再修改LICENSE文件

$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD ..." to unstage)

        modified:  LICENSE

Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git checkout -- ..." to discard changes in working directory)

        modified:  LICENSE

$

$ git log
commit 585c29e790e925e8ed507f89f98a2a51842841ad (HEAD -> master)
Author: clz <[e-mail]>
Date: Wed Oct 11 10:27:21 2017 +0900

    add a license file

commit 60826d5fe077448baaf3ddede55365000f88bf72
Author: clongclz <[e-mail]>
Date: Wed Oct 11 10:14:52 2017 +0900

    add a readme file


$ git add LICENSE

$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD ..." to unstage)

        modified: LICENSE



$ git commit -m "change the license file"
[master 306a5fc] change the license file
 1 file changed, 1 insertion(+), 1 deletion(-)


$ git log
commit 306a5fc84f61e36d09e1c7c726ca125af59be856 (HEAD -> master)
Author: clz <[e-mail]>
Date: Wed Oct 11 11:32:59 2017 +0900

    change the license file

commit 585c29e790e925e8ed507f89f98a2a51842841ad
Author: clz <[e-mail]>
Date: Wed Oct 11 10:27:21 2017 +0900

    add a license file

commit 60826d5fe077448baaf3ddede55365000f88bf72
Author: clz <[e-mail]>
Date: Wed Oct 11 10:14:52 2017 +0900

    add a readme file