采用版本是2.30.0
下载文件:
wget –no-check-certificate https://www.kernel.org/pub/software/scm/git/git-2.30.0.tar.gz
解压文件:
tar -zvxf git-2.30.0.tar.gz
进入文件夹
cd git-2.30.0
编译文件
make prefix=/usr/local/git all
编译报错:
http.h:6:10: fatal error: curl/curl.h: No such file or directory
#include <curl/curl.h>
yum -y install curl-devel
http-push.c:22:10: fatal error: expat.h: No such file or directory
#include <expat.h>
yum install expat-devel
https://blog.csdn.net/weixin_41910427/article/details/82733265
P.s. 我是采用rpm包下载的方案:
https://centos.pkgs.org/7/centos-x86_64/expat-devel-2.1.0-12.el7.x86_64.rpm.html
git-compat-util.h:301:25: fatal error: openssl/ssl.h: No such file or directory
sudo yum install openssl-devel
安装Openssl开发包
生成执行程序:
sudo make prefix=/usr/local/git install
修改 /etc/profile 配置
export PATH=$PATH:/usr/local/git/bin
Git常用命令记录:
更新远端分支列表:
1 |
git remote update origin --prune |
本地分支去掉远端分支绑定
1 |
git branch --unset-upstream |
回退版本:
1 |
git reset --hard <commit_id> |
添加远端分支
1 |
git remote add <newname> <url> |
开发合并基本操作:
1 2 3 4 5 6 7 8 9 10 11 12 13 |
1. 更新dev分支代码 git pull origin dev 2. 拉出新分支 git checkout -b feature/xxx coding 3. git add filexxx 4. git commit -m"..." 5. git checkout dev 6. git pull origin dev 7. git checkout feature/xxx 8. 将dev分支合并到当前分支, 解决代码冲突: git merge dev 9. 提交到远端 git push origin feature/xxx 10.从远端发起MergeRequest, 合并代码 |
…