git学习笔记 DAY1
1> git-windows64bit install
1. 官网下载https://git-scm.com/downloads
2. 国内镜像(我选择的方法,下载速度要快很多)
https://pan.baidu.com/s/109pbnIL90oqQt7gjRBwMRA 提取码: 6asb
tip: 全部默认安装即可
2> create the version lib
**1. 打开Git Bash**
**2. 设置git个人信息**
$ git config --global user.name "Your Name"
$ git config --global user.email "email@example.com"*
**3. 创建一个空目录**
$ mkdir learngit
$ cd learngit
$ pwd
/c/Users/Administrator.PC-201810051050/learngit
**4. git init 使得这个目录可以被Git管理**
$ git init
3> samples
**1. 在目录下创建一个文档,并且将其添加到Git仓库**
$ vi readme.txt
$ git add readme.txt
$ git commit -m 'write a readme file'
**2. 修改文档,使其获得新版本**
$ vi readme.txt
$ 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”)
$ git diff readme.txt #查看文档修改情况
diff --git a/readme.txt b/readme.txt
index 380bce1…87aec63 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
$ git add readme.txt
$ git commit -m 'add distributed'
$ git status
On branch master
nothing to commit, working tree clean
(表明添加成功)
3. 版本的回退和恢复
$ git log #查看所有版本信息
$ git log --pretty=oneline #查看简略版本信息
$ git reset --hard HEAD^ #回退上一版本
$ cat readme.txt #查看文档内容
$ git reset --hard ***your commit id***#恢复到某一版本
$ git reflog #查看版本commit id
4> problems
$ git add readme.txt 发生警告
warning: LF will be replaced by CRLF in readme.txt.
The file will have its original line endings in your working directory.
windows中的换行符为 CRLF, 而在linux下的换行符为LF,所以在执行add . 时出现提示,解决办法:
$ rm -rf .git // 删除.git
$ git config --global core.autocrlf false //禁用自动转换
然后重新执行:
$ git init
$ git add .
解决方案来自:https://blog.csdn.net/unityoxb/article/details/20768687