GIT常用命令和常用设置

你的名字 2021-10-13 00:55 306阅读 0赞

# 一、常用命令 #

<table style="width:500px;"> 
 <tbody> 
  <tr> 
   <td>查看本地分支</td> 
   <td>git branch</td> 
  </tr> 
  <tr> 
   <td>查看远程分支</td> 
   <td>git branch -r</td> 
  </tr> 
  <tr> 
   <td>创建分支</td> 
   <td>&nbsp;</td> 
  </tr> 
  <tr> 
   <td>切换分支xxx</td> 
   <td>git checkout xxx</td> 
  </tr> 
  <tr> 
   <td>创建并切换到新分支xxx</td> 
   <td>git checkout -b xxx</td> 
  </tr> 
  <tr> 
   <td>删除本地分支</td> 
   <td>git branch -d&nbsp;分支名称</td> 
  </tr> 
  <tr> 
   <td>删除分支</td> 
   <td>git push origin :分支名称</td> 
  </tr> 
  <tr> 
   <td>添加所有文件</td> 
   <td>git add .</td> 
  </tr> 
  <tr> 
   <td>提交</td> 
   <td>git commit -m "提交信息"</td> 
  </tr> 
  <tr> 
   <td>推送</td> 
   <td>git push</td> 
  </tr> 
  <tr> 
   <td>下拉</td> 
   <td>git pull</td> 
  </tr> 
  <tr> 
   <td>合并分支</td> 
   <td>git merge "指定分支"</td> 
  </tr> 
  <tr> 
   <td>查看版本</td> 
   <td>git remote -v</td> 
  </tr> 
  <tr> 
   <td>去除版本控制</td> 
   <td>git remote remove origin</td> 
  </tr> 
  <tr> 
   <td>创建tag</td> 
   <td>git tag&nbsp;标签名称</td> 
  </tr> 
  <tr> 
   <td>查看tag信息</td> 
   <td>git show&nbsp;标签名称</td> 
  </tr> 
  <tr> 
   <td>查看本地所有tag</td> 
   <td>git tag&nbsp; 或者 git tag -l</td> 
  </tr> 
  <tr> 
   <td>查看远程tag</td> 
   <td>git ls-remote --tags origin</td> 
  </tr> 
  <tr> 
   <td> <p>提交指定tag到远程</p> </td> 
   <td>git push origin&nbsp;标签名称</td> 
  </tr> 
  <tr> 
   <td>提交所有tag到远程</td> 
   <td>git push origin --tags</td> 
  </tr> 
  <tr> 
   <td>删除本地tag</td> 
   <td>git tag -d&nbsp;标签名称</td> 
  </tr> 
  <tr> 
   <td>删除远程tag</td> 
   <td>git push origin :标签名称</td> 
  </tr> 
  <tr> 
   <td>检出标签</td> 
   <td>git checkout -b &lt;分支名称&gt; &lt;标签名称&gt;</td> 
  </tr> 
  <tr> 
   <td>回滚代码到指定提交记录</td> 
   <td> <p>git reset --hard commit的提交记录</p> <p>git push -f</p> </td> 
  </tr> 
 </tbody> 
</table>

# 二、常用操作 #

## 2.1 全局设置用户名密码 ##

git config --global user.name "xxx@xxx.com"
    git config --global user.password "xxx"

## 2.2 清除git的版本控制 ##

*  右键git bash here, 在指定目录使用如下命令即可： 
    
        find . -name ".git" | xargs rm -rf

## 2.3 git commit 忽略eslint 校验 ##

*  右键git bash here, 在指定目录使用如下命令即可：

git commit --no-verify -m "commit"

## 2.4 idea中git每次提交都需要输入用户名密码，忽略 ##

git config --global credential.helper store

## 2.5 新分支开发流程 ##

创建新分支：
    git clone master分支代码路径
    git checkout -b 新分支   创建并切换到新分支
    
    
    
    在feature分支：
    git add .
    git commit -m "添加信息"
    git push 
    
    切换到目标分支，如：test-master分支
    git pull
    git merge 指定的分支
    git push
    
    
    合并master在页面合并
    Merge-request -> Net Merge request -> 选择要合并的源分支 和 目标分支 -> 选择是否需要删除feature分支 -> merge

## 2.6 保留提交历史记录添加到新分支 ##

qjwyss@2D7F-qjwyssMINGW64 /e/workspace/master/tss-gateway (master)
    $ git remote -v
    origin  git@gitlab.egomsl.com:lwg/tss-gateway.git (fetch)
    origin  git@gitlab.egomsl.com:lwg/tss-gateway.git (push)
    
    qjwyss@2D7F-qjwyssMINGW64 /e/workspace/master/tss-gateway (master)
    $ git remote remove origin
    
    qjwyss@2D7F-qjwyssMINGW64 /e/workspace/master/tss-gateway (master)
    $ git remote add origin git@gitlab.egomsl.com:ts/tss-gateway.git
    
    qjwyss@2D7F-qjwyssMINGW64 /e/workspace/master/tss-gateway (master)
    $ git push -u
    fatal: The current branch master has no upstream branch.
    To push the current branch and set the remote as upstream, use
    
        git push --set-upstream origin master
    
    
    qjwyss@2D7F-qjwyssMINGW64 /e/workspace/master/tss-gateway (master)
    $ git push --set-upstream origin master
    Enumerating objects: 206, done.
    Counting objects: 100% (206/206), done.
    Delta compression using up to 2 threads
    Compressing objects: 100% (97/97), done.
    Writing objects: 100% (206/206), 26.15 KiB | 1.45 MiB/s, done.
    Total 206 (delta 64), reused 206 (delta 64)
    remote: Resolving deltas: 100% (64/64), done.
    To gitlab.egomsl.com:ts/tss-gateway.git
     * [new branch]      master -> master
    Branch 'master' set up to track remote branch 'master' from 'origin'.
    
    qjwyss@2D7F-qjwyss MINGW64 /e/workspace/master/tss-gateway (master)

## 2.7 GPG Passphrase:\*解决 ##

mvn install -Dgpg.skip