本文共 5996 字,大约阅读时间需要 19 分钟。
准备环境:172.18.9.200是gitlab、172.18.9.201是jenkinsGit是gitlab的客户端命令,gitlab是应用程序
rpm包国内下载地址:
(注:我在此处停留很久,因为我yum时总是报错“Nothing to do”,只要我们mount上光盘,配好epel源aliyun的镜像即可yum了,因为此时源码包已上传至虚拟机,这时下载源码包已经和yum源没关系了)
port=2022 #默认为22,必改
external_url '' 此项改为IP,是为了让开发人员能连上我们。
###Email Settingsgitlab_rails['smtp_enable'] = truegitlab_rails['smtp_address'] = "smtp.163.com"gitlab_rails['smtp_port'] = 25gitlab_rails['smtp_user_name'] = "rooroot@163.com"gitlab_rails['smtp_password'] = "zhang@123"gitlab_rails['smtp_domain'] = "163.com"gitlab_rails['smtp_authentication'] = :logingitlab_rails['smtp_enable_starttls_auto'] = truegitlab_rails['smtp_tls'] = falsegitlab_rails['gitlab_email_from'] = "rooroot@163.com"user["git_user_email"] = rooroot@"163.com" 该处的“”必须加上,[root@200 ~]#gitlab-
gitlab-ctl gitlab-psql gitlab-rails gitlab-rakerun: alertmanager: (pid 30017) 149s; run: log: (pid 29629) 188s
run: gitaly: (pid 29893) 154s; run: log: (pid 28314) 338srun: gitlab-monitor: (pid 29950) 153s; run: log: (pid 29390) 212srun: gitlab-workhorse: (pid 29911) 154s; run: log: (pid 29077) 243srun: logrotate: (pid 29207) 233s; run: log: (pid 29228) 230srun: nginx: (pid 29144) 239s; run: log: (pid 29167) 236s[root@200 src]#ntpdate 172.18.0.1
23 Apr 11:41:27 ntpdate[32929]: adjust time server 172.18.0.1 offset -0.188343 sec[root@200 src]#gitlab-ctl restartok: run: alertmanager: (pid 32972) 0sok: run: gitaly: (pid 32987) 0sok: run: nginx: (pid 33037) 1s[root@201 ~]#git clone
Cloning into 'web1'...Username for '': Leslie #这是namePassword for '':remote: Enumerating objects: 3, done.remote: Counting objects: 100% (3/3), done.remote: Total 3 (delta 0), reused 0 (delta 0)Unpacking objects: 100% (3/3), done.[root@201 ~]#lltotal 12drwxr-xr-x. 3 root root 36 Apr 23 12:23 web1[root@201 ~]#cd web1/[root@201 web1]#lltotal 4-rw-r--r--. 1 root root 23 Apr 23 12:23 index.html[root@201 web1]#vim index.html马哥教育Linux 35 v1[root@201 ~]#git config --global user.name "user1"
[root@201 ~]#git config --global user.email "test.@qq.com"[root@201 ~]#cd web1/[root@201 web1]#vim index.html马哥教育 Linux 35 v1马哥教育 Linux 35 v2[root@201 web1]#git add ./*[root@201 web1]#git commit -m "v2"[master ca130ab] v21 file changed, 2 insertions(+), 1 deletion(-)[root@201 web1]#git pushwarning: push.default is unset; its implicit value is changing inGit 2.0 from 'matching' to 'simple'. To squelch this messageand 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 '': Leslie
Password for '':Counting objects: 5, done.Writing objects: 100% (3/3), 258 bytes | 0 bytes/s, done.Total 3 (delta 0), reused 0 (delta 0)To 3af0975..ca130ab master -> master #默认是masterSwitched to a new branch 'develop'
[root@201 web1]#git branchdevelop
master{插播:如何寻找develop分支的clone}:步骤:Groups,web35,web1,点击“+”,创建新branch,再返回web1点击“clone”,即可!![root@200 src]#git clone -b develop
Cloning into 'web1'...Username for '': LesliePassword for '':remote: Enumerating objects: 6, done.remote: Counting objects: 100% (6/6), done.remote: Compressing objects: 100% (2/2), done.remote: Total 6 (delta 0), reused 0 (delta 0)Unpacking objects: 100% (6/6), done.马哥教育Linux 35 v1
马哥教育Linux 35 v2马哥教育Linux 35 v3 #这些内容只有经过测试才会被发布到线上[develop 89e511c] v3
1 file changed, 2 insertions(+)[root@200 web1]#git pushwarning: push.default is unset; its implicit value is changing inGit 2.0 from 'matching' to 'simple'. To squelch this messageand 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 '': Leslie
Password for '':Counting objects: 5, done.Delta compression using up to 4 threads.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)remote:remote: To create a merge request for develop, visit:remote: remote:To ca130ab..89e511c develop -> developgit config --globaluser.name “name“ #设置全局用户名
git config --globaluser.email xxx@xx.com#设置全局邮箱git config --global –list #列出用户全局设置git add index.html / . #添加指定文件、目录或当前目录下所有数据到暂存区git commit -m“11“ #提交文件到工作区gitstatus #查看工作区的状态git push #提交代码到服务器git pull #获取代码到本地gitlog #查看操作日志vim . gitignore #定义忽略文件基于仓库的回滚:git reset --hard HEAD^^ #git 版本回滚, HEAD 为当前版本,加一个^为上一个,^^为上上一个版本gitreflog # #获取每次提交的 ID,可以使用--hard 根据提交的 ID 进行版本回退gitreset --hard 5ae4b06 #回退到指定 id 的版本#git branch #查看当前所处的分支#git checkout -b develop #创建并切换到一个新分支#git checkout develop #切换分支转载于:https://blog.51cto.com/14128387/2385664