git常用命令备忘

ゞ浴缸里的玫瑰 2023-06-21 10:22 5阅读 0赞

1.  查看git help文档

git help     
    git commit -h

1.  配置

$ git config --global user.name "John Doe"
    $ git config --global user.email johndoe@example.com

1.  拉指定分支的代码

git clone -b dev_xx http://10.1.1.101/service/xxxx.git

1.  日常提交查看

git status    #查看状态
    git add .    #添加所有文件，或者可以根据提示add指定代码
    git commit -m 'your log'  #提交代码并填写提交log
    git push   #推送代码

最常用，还有一些接下来操作的提示  
![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L0RheGlhTGVlU3VwZXI_size_16_color_FFFFFF_t_70]

1.  创建一个新的分支

Thinkpad@DESKTOP-URMIM71 MINGW64 /e/Mocha_Spectron_example (master)
    $ git branch
    * master
    
    Thinkpad@DESKTOP-URMIM71 MINGW64 /e/Mocha_Spectron_example (master)
    $ git branch -a
    * master
      remotes/origin/HEAD -> origin/master
      remotes/origin/master
    
    Thinkpad@DESKTOP-URMIM71 MINGW64 /e/Mocha_Spectron_example (master)
    $ git checkout -b dev_1
    Switched to a new branch 'dev_1'
    
    Thinkpad@DESKTOP-URMIM71 MINGW64 /e/Mocha_Spectron_example (dev_1)
    $ git status
    On branch dev_1
    nothing to commit, working tree clean
    
    Thinkpad@DESKTOP-URMIM71 MINGW64 /e/Mocha_Spectron_example (dev_1)
    $ git push
    fatal: The current branch dev_1 has no upstream branch.
    To push the current branch and set the remote as upstream, use
    
        git push --set-upstream origin dev_1
    
    
    Thinkpad@DESKTOP-URMIM71 MINGW64 /e/Mocha_Spectron_example (dev_1)
    $ git push --set-upstream origin dev_1
    Total 0 (delta 0), reused 0 (delta 0)
    remote: Powered by GITEE.COM [GNK-3.8]
    remote: Create a pull request for 'dev_1' on Gitee by visiting:
    remote:     https://gitee.com/DaxiaLee/Mocha_Spectron_example/pull/new/DaxiaLee:dev_1...DaxiaLee:master
    To https://gitee.com/DaxiaLee/Mocha_Spectron_example.git
     * [new branch]      dev_1 -> dev_1
    Branch 'dev_1' set up to track remote branch 'dev_1' from 'origin'.
    
    Think

1.  将已跟踪的代码删除

git rm -r --cached 路径
    git rm --cached 具体文件

1.  合并分支  
    如果我们现在在dev分支开发，要把dev分支合并到master分支

#在当前分支提交所有代码
    git  add .
    git  commit -m '提交的备注信息'
    git  push -u origin dev
    
    #切换到master分支
    git  checkout master
    
    #把master分支的代码全部pull下来
    git pull origin master
    
    #合并分支，如果有冲突就解决
    git  merge dev
    
    #查看分支状态
    git status
    
    On branch master
    Your branch is ahead of 'origin/master' by 12 commits.
      (use "git push" to publish your local commits)
    nothing to commit, working tree clean
    
    //上面的意思就是你有12个commit，需要push到远程master上 
    > 最后执行下面提交命令
    git push origin master

合并分支后其它可能用到的命令，删除分支

更新远程分支列表
    git remote update origin --prune
    
    查看所有分支
    git branch -a
    
    删除远程分支Chapater6
    git push origin --delete Chapater6
    
    删除本地分支 Chapater6
    git branch -d  Chapater6

[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L0RheGlhTGVlU3VwZXI_size_16_color_FFFFFF_t_70]: https://img-blog.csdnimg.cn/20191212120237745.png?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L0RheGlhTGVlU3VwZXI=,size_16,color_FFFFFF,t_70