单机上使用git(上)
1、安装git
[root@o20171014056080 ~]# yum install -y git
2、创建存放地址
[root@o20171014056080 ~]# mkdir /data/gitroot
3、初始化
[root@o20171014056080 ~]# cd /data/gitroot [root@o20171014056080 gitroot]# git initInitialized empty Git repository in /data/gitroot/.git/
4、测试
[root@o20171014056080 gitroot]# echo -e “123\naaa\n456\nbbb” > 1.txt//把1.txt添加到仓库
报错
[root@o20171014056080 gitroot]# git commit -m "add 1.txt"
*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: unable to auto-detect email address (got 'root@o20171014056080.(none)')
解决办法
所以解决方法是当出现这个上述提示后 接着补充
你在命令行中执行
git config --global user.email "你的邮箱"
git config --global user.name "你的名字"
（注意 “ 前面是有空格的）
输入完后再接着执行git commit 即可成功!
[root@o20171014056080 gitroot]# git commit -m "add 1.txt" [master (root-commit) 87b930e] add 1.txt 1 file changed, 1 insertion(+)create mode 100644 1.txt
5、查看当前仓库中的状态，比如是否有改动的文件
[root@o20171014056080 gitroot]# git status # On branch masternothing to commit, working directory clean
6、可以对比1.txt本次修改了什么内容，相比较仓库里面的版本
[root@o20171014056080 gitroot]# git diff 1.txt
7、查看所有提交记录
[root@o20171014056080 gitroot]# git log //查看所有提交记录commit 1d6ae5472c05adbd3d2363b15fb7d9a66e16d996 Author: 346284985 <346284985@qq.com>Date: Sun Jun 10 14:20:40 2018 -0400 add 1.txt commit 87b930eef3897c4b5a4343a763c1e4b7a06eb3b3 Author: 346284985 <346284985@qq.com>Date: Sun Jun 10 14:18:22 2018 -0400 add 1.txt
一行显示
[root@o20171014056080 gitroot]# git log --pretty=oneline // 一行显示1d6ae5472c05adbd3d2363b15fb7d9a66e16d996 add 1.txt 87b930eef3897c4b5a4343a763c1e4b7a06eb3b3 add 1.txt
8、回退版本，其中后面跟的字符串是简写
[root@o20171014056080 gitroot]# git reset --hard 87b930eef389 [root@o20171014056080 gitroot]# git reflog 查看所有历史版本 [root@o20171014056080 gitroot]# git checkout -- 1.txt//恢复1.txt如果1.txt文件修改，add后但没有commit，再想回退到上一次提交的状态，可以使用git reset HEAD 1.txt，再执行git checkout -- 1.txt
9、删除文件
[root@o20171014056080 gitroot]# echo -e "11111111111\n2222222222" > 2.txt [root@o20171014056080 gitroot]# git rm 2.txt [root@o20171014056080 gitroot]# git commit -m "rm 2.txt"
建立远程仓库
首先到 https://github.com 注册一个账号
设置用户名账号密码
注册完后登入地址https://github.com/login
新建一个仓库
设置代码库名称和说明
设置权限-对外公开或者私有，最后点击create repository创建
创建完成后可以看到简单的说明
添加key
注意：标题随便写，key就是你的公钥
[root@o20171014056080 gitroot]# ssh-keygen 生成一个公钥
如图生成了一个key
解下来我们在本地服务器上链接远程仓库
[root@o20171014056080 ahaoyw]# echo "# code" >> README.md //创建一个说明 [root@o20171014056080 ahaoyw]# git init //初始化吧README.md 提交到仓库里面去 [root@o20171014056080 ahaoyw]# git add README.md [root@o20171014056080 ahaoyw]# git commit -m "first commit"[master (root-commit) 7a619ed] first commit 1 file changed, 1 insertion(+)create mode 100644 README.md [root@o20171014056080 ahaoyw]# git remote add origin https://github.com/ahaoyw/code.git //当前仓库推送到远程去 [root@o20171014056080 ahaoyw]# git push -u origin master //更改推送到远程上去报错 fatal: unable to access 'https://github.com/ahaoyw/code.git/': Peer reports incompatible or unsupported protocol version. 解决办法： [root@o20171014056080 ahaoyw]# yum update -y nss curl libcurl [root@o20171014056080 ahaoyw]# git push -u origin masterUsername for 'https://github.com': 346284985@qq.com Password for 'https://346284985@qq.com@github.com':Counting objects: 3, done. Writing objects: 100% (3/3), 210 bytes | 0 bytes/s, done. Total 3 (delta 0), reused 0 (delta 0)To https://github.com/ahaoyw/code.git * [new branch] master -> master Branch master set up to track remote branch master from origin.
克隆远程仓库
.1、克隆
[root@o20171014056080 ahaoyw]# cd /home [root@o20171014056080 home]# git clone https://github.com/ahaoyw/code.gitCloning into 'code'... remote: Counting objects: 6, done. remote: Compressing objects: 100% (2/2), done. remote: Total 6 (delta 0), reused 3 (delta 0), pack-reused 0 Unpacking objects: 100% (6/6), done.
2、推送
[root@o20171014056080 code]# git add 1.txt [root@o20171014056080 code]# git commit -m "sdlfasdf"[master ebe4480] sdlfasdf 1 file changed, 1 insertion(+)create mode 100644 1.txt
3、往远程仓库上面推送
[root@o20171014056080 code]# git push 往远程仓库上面推送 warning: push.default is unset; its implicit value is changing inGit 2.0 from 'matching' to 'simple'. To squelch this message and maintain the current behavior after the default changes, use:git config --global push.default matching To squelch this message and adopt the new behavior now, use:git config --global push.default simple See 'git help config' and search for 'push.default' for further information.(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode'current' instead of 'simple' if you sometimes use older versions of Git)Username for 'https://github.com': 346284985@qq.com Password for 'https://346284985@qq.com@github.com':Counting objects: 4, done. Delta compression using up to 2 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 267 bytes | 0 bytes/s, done. Total 3 (delta 0), reused 0 (delta 0)To https://github.com/ahaoyw/code.git 9244a50..ebe4480 master -> master
