22.3 GIT
前面有讲到过,GIT是分布式的,GIT不需要依赖服务端,在自己的机器上就可以工作。
单机使用GIT
- 安装:
# yum install -y git
- 初始化仓库:
# mkdir /data/gitroot && cd /data/gitroot/
# git init
Initialized empty Git repository in /data/gitroot/.git/
# ls -la
total 0
drwxr-xr-x 3 root root 18 Aug 31 22:06 .
drwxr-xr-x 5 root root 51 Aug 31 22:05 ..
drwxr-xr-x 7 root root 119 Aug 31 22:06 .git #和svn有点类似
# ls .git/
branches config description HEAD hooks info objects refs
- 上传文件:
# vim 1.txt #随便写点东西
rggjohktrlhm
dkmklwdo3ofker
gjrkghrjlhkgrlh
# vim 1.txt
# vim .git/config #添加下面内容,否则下面提交到仓库会报错
[user]
name = lzx
email = lzx@lzx.com
# git add 1.txt #添加到仓库
# git commit -m "add 1.txt" #正式提交到仓库
[master (root-commit) dd8aa2f] add 1.txt
1 file changed, 3 insertions(+)
create mode 100644 1.txt
- 更改文件:
# vim 1.txt #更改1.txt
rggjohktrlhm
dkmklwdo3ofker
gjrkghrjlhkgrlh
deihfefufr
absqwjbejwfn
# git add 1.txt
# git commit -m "add 1.txt agin" #再次提交
[master 70335c6] add 1.txt agin
1 file changed, 2 insertions(+)
# git status #查看仓库状态
# On branch master
nothing to commit, working directory clean #干净的工作区,没有文件要提交
# vim 1.txt #更改1.txt
rggjohktrlhm
dkmklwdo3ofker
gjrkghrjlhkgrlh
# git status #没有执行add和commit,所以提示我们执行这两步
# 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: 1.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
- 对比:
# git diff 1.txt #查看变更,将更改后的内容和之前内容作对比
diff --git a/1.txt b/1.txt
index be325ea..a42241c 100644
--- a/1.txt
+++ b/1.txt
@@ -1,5 +1,4 @@
rggjohktrlhm
dkmklwdo3ofker
gjrkghrjlhkgrlh
-deihfefufr
-absqwjbejwfn #显示我删掉了最后面两行
+
- 查看变更记录:
# git add 1.txt
# git commit -m "add 1.txt agin"
[master 129107f] add 1.txt agin
1 file changed, 1 insertion(+), 2 deletions(-)
# git log #查看变更记录
commit 129107fc060b196b813d5070b0c80de1f7b450c1
Author: lzx <lzx@lzx.com> #之前修改配置文件定义的用户和邮箱
Date: Fri Aug 31 22:29:01 2018 -0400
add 1.txt agin
commit 70335c6f9906c1e171fbad0a5146fc6084779ee7
Author: lzx <lzx@lzx.com>
Date: Fri Aug 31 22:21:07 2018 -0400
add 1.txt agin
commit dd8aa2f8aed7d30d7163b1e0c49d3f2001e9ea81
Author: lzx <lzx@lzx.com>
Date: Fri Aug 31 22:15:26 2018 -0400
add 1.txt
# git log --pretty=oneline #以一行形式显示变更记录
129107fc060b196b813d5070b0c80de1f7b450c1 add 1.txt agin
70335c6f9906c1e171fbad0a5146fc6084779ee7 add 1.txt agin
dd8aa2f8aed7d30d7163b1e0c49d3f2001e9ea81 add 1.txt #-m 指定解释说明字段,可以在这里显示出来,比较重要
- 回退版本:
上面的每一行都可以看做是一个版本
# git reset --hard 70335c #回退版本,最后面的字符串可以简写
HEAD is now at 70335c6 add 1.txt agin
# git log --pretty=oneline
70335c6f9906c1e171fbad0a5146fc6084779ee7 add 1.txt agin
dd8aa2f8aed7d30d7163b1e0c49d3f2001e9ea81 add 1.txt #变成两行了,回退之后最新的版本消失
假如回退了版本之后又后悔了怎么办,如果记得之前最新版本的字符串还可以更改,那如果不记得了怎么办?
- 查看所有历史版本:
# git reflog #查看所有历史版本,可以得到之前代表最新版本的字符串
70335c6 HEAD@{0}: reset: moving to 70335c
129107f HEAD@{1}: commit: add 1.txt agin
70335c6 HEAD@{2}: commit: add 1.txt agin
dd8aa2f HEAD@{3}: commit (initial): add 1.txt
# git reset --hard 129107f #再回退到最新版本
HEAD is now at 129107f add 1.txt agin
# git log --pretty=oneline
129107fc060b196b813d5070b0c80de1f7b450c1 add 1.txt agin
70335c6f9906c1e171fbad0a5146fc6084779ee7 add 1.txt agin
dd8aa2f8aed7d30d7163b1e0c49d3f2001e9ea81 add 1.txt #可以看到已经回到了最新版本
如果不小心把文件删掉了怎么办?
- 恢复文件:
# ls
1.txt
# rm -rf 1.txt
# ls
# git checkout -- 1.txt #恢复文件
# ls
1.txt
因为文件还在git版本库里面,所以才可以恢复。
如果文件作了修改,而且add了,但没有commit,如何撤销add,回到提交add前的状态呢?
- 回到提交前的状态:
# vim 1.txt #更改1.txt
rggjohktrlhm
dkmklwdo3ofker
gjrkghrjlhkgrlh
nfbgfrjegbjerk
fejkfnergner
frjgkoerhgi
# git add 1.txt
# git reset HEAD 1.txt #撤销add操作,回到提交前的状态
Unstaged changes after reset:
M 1.txt
# git checkout -- 1.txt #恢复版本库里的最新版本,撤销了修改
# cat 1.txt
rggjohktrlhm
dkmklwdo3ofker
gjrkghrjlhkgrlh
从上面可以看出来,每次修改完之后都必须要add和commit,否则版本库里不会更新。
- 删除文件:
# git rm 1.txt #在本地删除1.txt
rm '1.txt'
# ls
# git reset HEAD 1.txt #撤销del操作,回到删除前的状态
Unstaged changes after reset:
D 1.txt
# git checkout -- 1.txt #恢复1.txt
# ls
1.txt
真正删除一个文件
# git rm 1.txt #在本地删除1.txt
rm '1.txt'
# ls
# git commit -m "delete 1.txt" #从版本库里删除1.txt
[master b7f069a] delete 1.txt
1 file changed, 4 deletions(-)
delete mode 100644 1.txt
# git reset HEAD 1.txt
# git checkout -- 1.txt #这样再想恢复就无法恢复了
error: pathspec '1.txt' did not match any file(s) known to git.
确实想再恢复它
# git log --pretty=oneline
b7f069a9146fea7e0682266a857708f42ccb460d delete 1.txt
129107fc060b196b813d5070b0c80de1f7b450c1 add 1.txt agin
70335c6f9906c1e171fbad0a5146fc6084779ee7 add 1.txt agin
dd8aa2f8aed7d30d7163b1e0c49d3f2001e9ea81 add 1.txt
git reset --hard 129107fc #通过版本字符串,reset恢复
HEAD is now at 129107f add 1.txt agin
# ls
1.txt
# cat 1.txt
rggjohktrlhm
dkmklwdo3ofker
gjrkghrjlhkgrlh
建立远程仓库
-
浏览器打开
www.github.com
,注册账号,创建新的仓库; -
仓库名字自定义,选择public(private收费),点击创建仓库;
-
添加key,右上角点击个人头像,选择
setting
,左侧选择SSH and GRP keys
,然后右侧选择New SSH key
; -
在linux机器上创建SSH公钥:
# ssh-keygen
Generating public/private rsa key pair.
Enter file in which to save the key (/root/.ssh/id_rsa): #直接按Enter键
Enter passphrase (empty for no passphrase): #输入密码,建议留空
Enter same passphrase again: #确认密码
Your identification has been saved in /root/.ssh/id_rsa.
Your public key has been saved in /root/.ssh/id_rsa.pub.
The key fingerprint is:
SHA256:/jPZgy/prZShxkNduQ1xlOST/pfzYCf2el0JLeQsWCY root@lzx
The key's randomart image is:
+---[RSA 2048]----+
| .o+. |
| E o *.. |
| = B = |
| o o X o |
| S o o = .|
| + . o oo|
| * o= =o*|
| . +B.oo =*|
| .+*o..oo|
+----[SHA256]-----+
# cat .ssh/id_rsa.pub #查看公钥
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqWlFPl3JwzR3AiJgolBthMJradp2r1UekJZnnU5hVjDb+pZ72YQUfNdatuUMr96avQYsF+V61sOc/cxa3YPn35n36TW8P+u7FMxZf31eqMatcHG/AWvjW0UsDw+zQrBr5414mj+AIYQgj0GtDIQJbfifGizK7i9UPLy7oW3Ss7+G2+fqhJ2hIo6qTSBHwSdN3rn9ypL0dPIEqJyaaBUpg5a5JKv3KHO5EyJt6Z787SPf3snKddQNpLkgoQ8yPcbZQ3BE5gt6DapMMpLEUUR2adIfe0rWqcDr4Gp9QTW0u+/LgFI6I1UKdTVYvU2UkpUf4WEp+6Q8AROasXxljrNC1 root@lzx
-
回到浏览器界面,Title自定义,将linux上公钥复制在Key中,然后
Add SSH key
,这样就生成了key,可以让服务端识别linux客户端; -
在linux客户端创建仓库,随意写点东西推送到远程服务端上:
# cd /tmp/
# mkdir mylinux && cd mylinux/
# echo "# mylinux" >> README.md
# git init
Initialized empty Git repository in /tmp/mylinux/.git/
# ls -la
total 8
drwxr-xr-x 3 root root 35 Sep 1 08:26 .
drwxrwxrwt. 12 root root 4096 Sep 1 08:25 ..
drwxr-xr-x 7 root root 119 Sep 1 08:26 .git
-rw-r--r-- 1 root root 10 Sep 1 08:25 README.md
# cd .git/
# ls .git/
branches config description HEAD hooks index info objects refs
# vim .git/config #添加下面内容,身份识别,否则commit报错
[user]
name = lzx
email = lzx@lzx.com #这里应该填你注册git时使用的用户名和邮箱
# git add README.md
# git commit -m "first commit"
[master (root-commit) ca836f8] first commit
1 file changed, 1 insertion(+)
create mode 100644 README.md
# git remote add origin https://github.com/Tobewont/mylinux.git
# 将当前仓库中的文件推送到远程服务端上
# git push -u origin master #将更改推送到远程服务端上
Username for 'https://github.com': Tobewont #输入之前注册git的用户名
Password for 'https://Tobewont@github.com': #输入之前注册git的密码
Counting objects: 3, done.
Writing objects: 100% (3/3), 211 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To https://github.com/Tobewont/mylinux.git
* [new branch] master -> master
Branch master set up to track remote branch master from origin.
然后在服务端刷新一下,就可以看到我们推送的内容了。
- 上面在 git push时还需要输入用户名和密码,很不方便:
# vim .git/config #url默认为https地址,修改为SSH地址
url = git@github.com:Tobewont/mylinux.git
# echo "lzxlzx" > 2.txt
# git add 2.txt
# git commit -m "add 2.txt"
[master 50590ed] add 2.txt
1 file changed, 1 insertion(+)
create mode 100644 2.txt
# git push -u origin master
Enter passphrase for key '/root/.ssh/id_rsa': #输入之前生成SSH时输入的密码即可,不用再输入用户名和密码
Counting objects: 4, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 266 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@github.com:Tobewont/mylinux.git
ca836f8..50590ed master -> master
Branch master set up to track remote branch master from origin.
克隆远程仓库
- 复制链接:
先在服务器端仓库找到Clone or download
按钮,复制链接:git@github.com:Tobewont/mylinux.git
。
- 然后在客户端进行clone:
# cd /home/
# ls
admin myproject
# git clone git@github.com:Tobewont/mylinux.git #git clone进行仓库克隆
Cloning into 'mylinux'...
Enter passphrase for key '/root/.ssh/id_rsa': #输入之前配置生成SSH时输入的密码,下面类似
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 6 (delta 0), reused 6 (delta 0), pack-reused 0
Receiving objects: 100% (6/6), done.
# ls
admin mylinux myproject
# ls mylinux/
2.txt README.md
- 客户端更改内容:
# vim mylinux/README.md
aaaaaa
bbbbbb
cccccc
# cd mylinux/
# git add README.md
# git commit -m "change readme.md"
[master e38ef1e] change readme.md
1 file changed, 3 insertions(+)
# git push #推送到服务端
Enter passphrase for key '/root/.ssh/id_rsa':
Counting objects: 5, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 283 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@github.com:Tobewont/mylinux.git
50590ed..e38ef1e master -> master
到服务端仓库查看,刷新一下就可以看到刚刚的更改。
- 服务端更改内容:
先在服务端仓库编辑README.md
,然后点击Commit changes
按钮提交。
- 在客户端查看:
# git pull #从服务端拉取内容
Enter passphrase for key '/root/.ssh/id_rsa':
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
Unpacking objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0
From github.com:Tobewont/mylinux
e38ef1e..c24d9bb master -> origin/master
Updating e38ef1e..c24d9bb
Fast-forward
README.md | 4 ++++
1 file changed, 4 insertions(+)
# cat README.md
# mylinux
aaaaaa
sn
ek
rk
gt #可以看到刚刚的更改
bbbbbb
cccccc
本地分支管理
- 查看分支:
# cd /data/gitroot/
# ls
1.txt
# git branch #查看分支
* master #当前处于master分支
- 创建分支:
# git branch lzx #创建分支
# git branch
lzx
* master #* 号表示当前处于哪一分支
- 切换分支:
# git checkout lzx #切换分支
Switched to branch 'lzx'
# git branch
* lzx
master
# ls
1.txt
- 分支之间相互隔离:
# echo "adfwrfrg" > 2.txt
# git add 2.txt
# git commit -m "add 2.txt"
[lzx 9a601f6] add 2.txt
1 file changed, 1 insertion(+)
create mode 100644 2.txt
# ls
1.txt 2.txt #分支lzx增加了2.txt
# git checkout master
Switched to branch 'master'
# ls
1.txt #master分支并没有2.txt
- 分支合并:
如果想把lzx分支合并到master分支,就需要先切换到master分支
# git branch
lzx
* master
# git merge lzx #合并分支
Updating 129107f..9a601f6
Fast-forward
2.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 2.txt
# ls
1.txt 2.txt #此时就可以查看到lzx分支的内容
- 合并冲突:
分支合并很容易产生冲突,如果master分支和lzx分支都对2.txt进行了编辑,
当合并时会提示冲突,需要先解决冲突才能继续合并
# vim 2.txt #添加下面内容
fjfier
frjgire
grjnkjrntg
# git add 2.txt
# git commit -m "add 2.txt"
[master 2852bdc] add 2.txt
1 file changed, 3 insertions(+)
# git checkout lzx #切换到lzx分支
Switched to branch 'lzx'
# vim 2.txt #添加下面内容,和上面不一致即可
fefre
gktmgt
gmlhmyj
# git add 2.txt
# git commit -m "add 2.txt"
[lzx 5fd7ae9] add 2.txt
1 file changed, 3 insertions(+)
# git checkout master #切换到master分支
Switched to branch 'master'
# git merge lzx #合并分支
Auto-merging 2.txt
CONFLICT (content): Merge conflict in 2.txt
Automatic merge failed; fix conflicts and then commit the result. #提示冲突
- 解决冲突合并:
产生冲突的原因就是两边提交的内容不一致,那解决冲突就是要让两边提交的内容一致
# vim 2.txt #修改为lzx分支中2.txt的内容
adfwrfrg
fefre
gktmgt
gmlhmyj
# git add 2.txt
# git commit -m "add 2.txt"
[master b23fe49] add 2.txt
1 file changed, 3 insertions(+), 3 deletions(-)
# git merge lzx
Already up-to-date. #合并成功
# git checkout lzx
Switched to branch 'lzx'
# cat 2.txt
adfwrfrg
fefre
gktmgt
gmlhmyj
而如果lzx分支修改的内容不是我们想要的怎么办?可以在lzx分支下修改为master分支中的内容,提交,然后合并master分支到lzx分支即可(倒着合并)。
分支合并的原则:要把最新的分支合并到旧的分支,即merge后面跟着的分支一定是最新的分支。
- 删除分支:
# git checkout master
Switched to branch 'master'
# git branch -d lzx #删除分支
Deleted branch lzx (was 5fd7ae9).
如果分支没有合并,删除之前会提示,那就不合并,强制删除:git branch -D lzx
远程分支管理
- 分支使用原则:
1. master分支十分重要,线上发布代码使用这个分支,开发代码不要使用这个分支;
2. 创建一个dev分支,专门用来开发,只有当需要发布到线上时,才会把dev分支合并到master分支;
3. 开发人员应该在dev的基础上再分支成个人分支,个人分支(在个人PC上)里面开发代码,再合并到dev分支。
本地新建的分支如果不推送到远程,对其他人就是不可见的。
- 服务端创建分支:
对勾在哪里就在哪一个分支下。
- 到客户端克隆分支:
# git clone git@github.com:Tobewont/mylinux.git
Cloning into 'mylinux'...
Enter passphrase for key '/root/.ssh/id_rsa': #输入之前配置生成SSH时输入的密码
remote: Counting objects: 12, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 12 (delta 0), reused 9 (delta 0), pack-reused 0
Receiving objects: 100% (12/12), done.
# cd mylinux/
# ls
2.txt README.md
# git branch
* master #可以看到只有一个master
即克隆远程仓库默认只会克隆master分支,即使远程仓库有多个分支。
- 查看远程所有分支:
# git ls-remote origin
Enter passphrase for key '/root/.ssh/id_rsa': #输入之前配置生成SSH时输入的密码
c24d9bbd51579bd6bb0b68484935732f61f7783c HEAD
c24d9bbd51579bd6bb0b68484935732f61f7783c refs/heads/dev
c24d9bbd51579bd6bb0b68484935732f61f7783c refs/heads/master
- 克隆指定分支:
# git checkout -b dev origin/dev #克隆远程分支并切换到该分支
Branch dev set up to track remote branch dev from origin.
Switched to a new branch 'dev'
# git branch
* dev
master
# ls
2.txt README.md
- 修改内容推送到分支:
# vim 2.txt #添加下面内容
fremkg
gtgtr;
gmtkrm
# git add 2.txt
# git commit -m "add 2.txt"
[dev 2bcdc0f] add 2.txt
1 file changed, 3 insertions(+)
# git push
Enter passphrase for key '/root/.ssh/id_rsa': #输入之前配置生成SSH时输入的密码
Counting objects: 5, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 287 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@github.com:Tobewont/mylinux.git
c24d9bb..2bcdc0f dev -> dev
# 当前在dev分支下,这里可以看出是本地dev分支推送到远程dev分支的,因为master分支没有做任何修改
对于git push有两种情况:
1. 当本地分支和远程分支一致时:
git push 会把所有分支的变更一同推送到远程,如果只想推送一个分支,使用git push origin branch-name
2. 当本地分支比远程分支多时:
git push 默认只推送本地与远程一致的分支,想要把多出来的分支推送到远程时,使用git push origin branch-name,
如果推送失败,先用git pull拉取远程内容重新提交
示例:
# git branch dev2
# git branch
* dev
dev2
master
# git checkout dev2
Switched to branch 'dev2'
# ls
2.txt README.md
# echo "lzxlzx" > 3.txt
# git add 3.txt
# git commit -m "add 3.txt"
[dev2 c8dd849] add 3.txt
1 file changed, 1 insertion(+)
create mode 100644 3.txt
# git push
fatal: The current branch dev2 has no upstream branch.
To push the current branch and set the remote as upstream, use
git push --set-upstream origin dev2 #提示你应该这样git push
# git push origin dev2
Enter passphrase for key '/root/.ssh/id_rsa':
Counting objects: 4, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 289 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 1 (delta 0)
To git@github.com:Tobewont/mylinux.git
* [new branch] dev2 -> dev2 #推送成功
刷新一下,可以看到服务端已经有dev2分支了。
并且dev2分支下有3.txt了。
标签管理
标签类似于快照功能,可以给版本库打一个标签,记录某个时刻版本库的状态,也可以随时恢复到该状态。相比于分支来说,分支更加实用。
标签主要是针对master分支进行操作。
- 打标签:
# git checkout master #切换到master分支
Switched to branch 'master'
# git tag v1.0 #打上标签v1.0
# git tag #查看当前分支所有标签
v1.0
# git show v1.0 #查看标签v1.0内容
commit c24d9bbd51579bd6bb0b68484935732f61f7783c #commit信息字符串
Author: Tobewont <42890839+Tobewont@users.noreply.github.com>
Date: Thu Sep 6 14:50:01 2018 +0800
Update README.md
diff --git a/README.md b/README.md
index 6ca591e..5fc27ec 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
# mylinux
aaaaaa
+sn
+ek
+rk
+gt
- tag是针对commit来打标签的,所以可以针对历史的commit来打标签:
# git log --pretty=oneline #查看历史commit
c24d9bbd51579bd6bb0b68484935732f61f7783c Update README.md
e38ef1e23a4dbf850dbfbfbe0e3253ccc343c740 change readme.md
50590ed936bf9585318a70156a01846fe78f7e74 add 2.txt
ca836f820e54cde73cfba7f768cb36cbce5c0975 first commit
# git log --pretty=oneline --abbrev-commit #查看历史commit,信息字符串简写
c24d9bb Update README.md
e38ef1e change readme.md
50590ed add 2.txt
ca836f8 first commit
# git tag v0.8 e38ef1e23a #针对commit打标签,commit信息字符串可以简写
# git tag
v0.8
v1.0
# git show v0.8
commit e38ef1e23a4dbf850dbfbfbe0e3253ccc343c740 #可以看到,commit信息是我们指定的
Author: lzx <lzx@lzx.com>
Date: Thu Sep 6 02:41:25 2018 -0400
change readme.md
diff --git a/README.md b/README.md
index cc9aa45..6ca591e 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,4 @@
# mylinux
+aaaaaa
+bbbbbb
+cccccc
- 打标签时可以对标签进行描述:
# git tag -a v0.1 -m "lzx tag" ca836f8
# git tag
v0.1
v0.8
v1.0
# git show v0.1
tag v0.1
Tagger: lzx <lzx@lzx.com>
Date: Thu Sep 6 04:58:56 2018 -0400
lzx tag #描述信息
commit ca836f820e54cde73cfba7f768cb36cbce5c0975 #指定的commit
Author: lzx <lzx@lzx.com>
Date: Sat Sep 1 08:29:16 2018 -0400
first commit
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..cc9aa45
--- /dev/null
+++ b/README.md
- 删除标签:
# git tag -d v0.1 #删除标签v0.1
Deleted tag 'v0.1' (was cdb35ab)
# git tag
v0.8
v1.0
以上操作都是在客户端本地进行的,在远程服务端还没有任何标签。
- 推送指定标签:
# git push origin v1.0 #推送标签v1.0
Enter passphrase for key '/root/.ssh/id_rsa':
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:Tobewont/mylinux.git
* [new tag] v1.0 -> v1.0
服务端刷新一下,可以看到刚刚推送的标签v1.0。
- 推送所有标签:
# git push --tag origin #推送所有标签
Enter passphrase for key '/root/.ssh/id_rsa':
Total 0 (delta 0), reused 0 (delta 0)
To git@github.com:Tobewont/mylinux.git
* [new tag] v0.8 -> v0.8 #v1.0已经推送,所以只显示v0.8为[new tag]
服务端刷新一下,可以看到刚刚推送的标签v0.8。
- 删除远程标签:
# git tag -d v0.8 #本地删除v0.8
Deleted tag 'v0.8' (was e38ef1e)
# git tag
v1.0
# git push origin :refs/tags/v0.8 #远程删除v0.8
Enter passphrase for key '/root/.ssh/id_rsa':
To git@github.com:Tobewont/mylinux.git
- [deleted] v0.8 #可以看到v0.8已经删除
服务端刷新一下,可以看到刚刚标签0.8已经被删除。
git别名
SVN可以使用别名,GIT也支持别名,命令支持Tab键补全。以下别名自定义。
- 给commit设置别名ci:
# echo "lzxlzx" > 4.txt
# git add 4.txt
# git config --global alias.ci commit #给commit设置别名ci
# git ci -m "add 4.txt"
[master 200f1f5] add 4.txt
1 file changed, 1 insertion(+)
create mode 100644 4.txt
- 给branch设置别名br:
# git config --global alias.br branch #给branch设置别名br
# git br
dev
dev2
* master
- 给checkout设置别名ch:
# git config --global alias.ch checkout #给checkout设置别名ch
# git br
dev
dev2
* master
# git ch dev
Switched to branch 'dev'
# git br
* dev
dev2
master
- 查看设置的别名:
# git config --list |grep alias #查看设置的别名
alias.ci=commit
alias.br=branch
alias.ch=checkout
- 查看所有的配置:
# git config --list #查看所有的配置
push.default=simple
user.name=lzx
user.email=lzx@lzx.com
alias.ci=commit
alias.br=branch
alias.ch=checkout
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.url=git@github.com:Tobewont/mylinux.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master
branch.dev.remote=origin
branch.dev.merge=refs/heads/dev
# cat ~/.gitconfig #别名也可以在配置文件中设置
[push]
default = simple
[user]
name = lzx
email = lzx@lzx.com
[alias]
ci = commit
br = branch
ch = checkout
- 取消别名:
# git config --global --unset alias.br #取消别名br
# git br
git: 'br' is not a git command. See 'git --help'. #提示br不是一个命令
Did you mean one of these?
branch
var
搭建git服务器
Github毕竟是公开的,而私有仓库又得花钱买。所以我们可以想办法搭建一个私有的仓库,只有自己公司使用的。Gitlab是一个不错的选择,在介绍它之前,先讲一下命令行的git服务器。
- 换一台机器,安装git:
# yum install -y git
- 添加git用户,并设置shell为
/usr/bin/git-shell
:
# useradd -s /usr/bin/git-shell git
设置shell为/usr/bin/git-shell
,目的是为了不让git用户远程登录。
- 创建authorized_keys文件,更改属主属组和权限:
# cd /home/git/
# mkdir .ssh
# touch .ssh/authorized_keys #用来存放客户端机器的公钥
# chmod 600 !$
chmod 600 .ssh/authorized_keys
# chown -R git:git .ssh
- 在客户端获取公钥:
# cat ~/.ssh/id_rsa.pub
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqWlFPl3JwzR3AiJgolBthMJradp2r1UekJZnnU5hVjDb+pZ72YQUfNdatuUMr96avQYsF+V61sOc/cxa3YPn35n36TW8P+u7FMxZf31eqMatcHG/AWvjW0UsDw+zQrBr5414mj+AIYQgj0GtDIQJbfifGizK7i9UPLy7oW3Ss7+G2+fqhJ2hIo6qTSBHwSdN3rn9ypL0dPIEqJyaaBUpg5a5JKv3KHO5EyJt6Z787SPf3snKddQNpLkgoQ8yPcbZQ3BE5gt6DapMMpLEUUR2adIfe0rWqcDr4Gp9QTW0u+/LgFI6I1UKdTVYvU2UkpUf4WEp+6Q8AROasXxljrNC1 root@lzx
粘贴到服务端刚刚新建的authorized_keys文件中
# vim .ssh/authorized_keys
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqWlFPl3JwzR3AiJgolBthMJradp2r1UekJZnnU5hVjDb+pZ72YQUfNdatuUMr96avQYsF+V61sOc/cxa3YPn35n36TW8P+u7FMxZf31eqMatcHG/AWvjW0UsDw+zQrBr5414mj+AIYQgj0GtDIQJbfifGizK7i9UPLy7oW3Ss7+G2+fqhJ2hIo6qTSBHwSdN3rn9ypL0dPIEqJyaaBUpg5a5JKv3KHO5EyJt6Z787SPf3snKddQNpLkgoQ8yPcbZQ3BE5gt6DapMMpLEUUR2adIfe0rWqcDr4Gp9QTW0u+/LgFI6I1UKdTVYvU2UkpUf4WEp+6Q8AROasXxljrNC1 root@lzx
- 客户端连接服务端:
# ssh git@192.168.100.160
The authenticity of host '192.168.100.160 (192.168.100.160)' can't be established.
ECDSA key fingerprint is SHA256:teKu3atU+OByPeXXD2xXhyb30vg6nW8ETqqCr785Dbc.
ECDSA key fingerprint is MD5:13:a4:f1:c0:1f:62:65:d4:f4:4e:42:ab:40:f1:36:60.
Are you sure you want to continue connecting (yes/no)? yes //输入yes
Warning: Permanently added '192.168.100.160' (ECDSA) to the list of known hosts.
Enter passphrase for key '/root/.ssh/id_rsa':
fatal: Interactive git shell is not enabled.
hint: ~/git-shell-commands should exist and have read and execute access. #提示说明验证成功
Connection to 192.168.100.160 closed.
- 服务端创建git仓库:
# cd /data/
# mkdir /data/gitroot/
# cd !$
cd /data/gitroot/
# git init --bare sample.git #创建sample.git裸仓库
Initialized empty Git repository in /data/gitroot/sample.git/
# ls
sample.git
# chown -R git:git sample.git
裸仓库没有工作区,因为服务器上的git仓库纯粹是为了共享,所以不让用户直接登录到服务器上更改工作区,并且服务器上的git仓库通常都是以.git结尾。
对于客户端来说,git服务器不需要开发人员直接登录,它仅仅是充当着服务器的角色,就像github一样,平时的操作都是在自己的PC上进行操作的。
客户端怎么使用git服务器呢?
1. 首先要把客户端上的公钥放到git服务器的/home/git/.ssh/authorized_keys文件里
2. 然后克隆git服务器的sampl.git仓库
3. 进入仓库进行操作,然后push到服务端
示例:
# git clone git@192.168.100.160:/data/gitroot/sample.git
Cloning into 'sample'...
Enter passphrase for key '/root/.ssh/id_rsa':
warning: You appear to have cloned an empty repository.
# ls
anaconda-ks.cfg mylinux sample
# cd sample/
# ls -la
total 0
drwxr-xr-x 3 root root 18 Sep 6 06:06 .
dr-xr-x---. 7 root root 276 Sep 6 06:06 ..
drwxr-xr-x 7 root root 119 Sep 6 06:06 .git
# cp /etc/init.d/README .
# git add .
# git commit -m "add new file"
[master (root-commit) 7ee55ab] add new file
1 file changed, 27 insertions(+)
create mode 100644 README
# git push origin master #不指定分支git push会报错,因为服务端是空仓库
Enter passphrase for key '/root/.ssh/id_rsa':
Counting objects: 3, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 781 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@192.168.100.160:/data/gitroot/sample.git
* [new branch] master -> master
# git push #再次git push就没问题了
Enter passphrase for key '/root/.ssh/id_rsa':
Everything up-to-date
# ls
README
# cd /tmp/
# git clone git@192.168.100.160:/data/gitroot/sample.git #换个目录克隆仓库
Cloning into 'sample'...
Enter passphrase for key '/root/.ssh/id_rsa':
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Receiving objects: 100% (3/3), done.
# cd sample/
# ls
README #发现有刚刚git push的文件
# echo "ufhueirhfi" > fff.txt
# git add fff.txt
# git commit -m "add fff.txt"
[master bb1f8d4] add fff.txt
1 file changed, 1 insertion(+)
create mode 100644 fff.txt
# git push
Enter passphrase for key '/root/.ssh/id_rsa':
Counting objects: 4, done.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 270 bytes | 0 bytes/s, done.
Total 3 (delta 0), reused 0 (delta 0)
To git@192.168.100.160:/data/gitroot/sample.git
7ee55ab..bb1f8d4 master -> master
# cd /root/sample/
# git pull #拉取仓库内容
Enter passphrase for key '/root/.ssh/id_rsa':
remote: Counting objects: 4, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From 192.168.100.160:/data/gitroot/sample
7ee55ab..bb1f8d4 master -> origin/master
Updating 7ee55ab..bb1f8d4
Fast-forward
fff.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 fff.txt
# ls
fff.txt README
# cat fff.txt
ufhueirhfi
这样就实现了公司内部人员的协同操作,这是一种简单的git服务器的搭建方法,适用于开发人员较少的公司。
更多资料参考: