Git(2)-Git常用的操作和概念

心已赠人 2023-06-27 03:45 24阅读 0赞

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

## Git 常用的指令和定义 ##

![在这里插入图片描述][watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L2hlbGxvd29ybGRkbQ_size_16_color_FFFFFF_t_70]

## Git操作 ##

$ git log
    commit 65901b6c3d9b366788ceffd9c6905b12e34d7068 (HEAD -> a1)
    Author: Burning Teng <2250911301@qq.com>
    Date:   Thu Jan 2 22:33:56 2020 +0800
    
        a1*4
    
    commit dbc6f316e6b3c3c23905fe2b8035a3acafe9d4b3
    Author: Burning Teng <2250911301@qq.com>
    Date:   Thu Jan 2 22:32:26 2020 +0800
    
        a1*3
    
    commit e93ff79c9c9a4fd7de4938fdcf128923a3eb669a
    Author: Burning Teng <2250911301@qq.com>
    Date:   Thu Jan 2 22:31:09 2020 +0800
    
        a1*2
    
    commit fe3f58bec8a08ea618f65a87c70ec72d507c2e0a (master)
    Author: Burning Teng <2250911301@qq.com>
    Date:   Thu Jan 2 01:10:59 2020 +0800
    
        a1+a1
    
        a1+a1+a1
    
        a1+a1+a1+a1
    
        a1+a1+a1+a1+a1
    
        a1*6
    
        a1*4
    
    commit 6e8da3d08c7f008eb8f9702f3ee970c90b37325b
    Author: Burning Teng <2250911301@qq.com>
    Date:   Thu Jan 2 01:10:27 2020 +0800
    
        a1

无论是修改commit的顺序还是修改commit信息，commit对应的文件信息等，都可以使用git rebase -i 来完成。

$ git rebase -i 6e8da3d08c7f008eb8f9702f3ee970c90b37325b
    [detached HEAD e5f7eae] a1 no2
     Date: Thu Jan 2 01:10:59 2020 +0800
     1 file changed, 1 insertion(+), 1 deletion(-)
    Stopped at e93ff79...  a1*2
    You can amend the commit now, with
    
      git commit --amend
    
    Once you are satisfied with your changes, run
    
      git rebase --continue
    
    Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)
    $ git branch
    * (no branch, rebasing a1)
      a1
      master
    
    Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)
    $ ls
    a.txt
    
    Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)
    $ vi a.txt
    
    Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)
    $ git commit --amend
    [detached HEAD 43cccc5] a1*2 no3
     Date: Thu Jan 2 22:31:09 2020 +0800
     1 file changed, 1 insertion(+), 1 deletion(-)
    
    Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)
    $ git branch
    * (no branch, rebasing a1)
      a1
      master
    
    Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)
    $ git status
    interactive rebase in progress; onto 6e8da3d
    Last commands done (2 commands done):
       reword fe3f58b a1+a1
       edit e93ff79 a1*2
    Next commands to do (2 remaining commands):
       pick dbc6f31 a1*3
       pick 65901b6 a1*4
      (use "git rebase --edit-todo" to view and edit)
    You are currently editing a commit while rebasing branch 'a1' on '6e8da3d'.
      (use "git commit --amend" to amend the current commit)
      (use "git rebase --continue" once you are satisfied with your changes)
    
    nothing to commit, working tree clean
    
    Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1|REBASE-i 2/4)
    $ git rebase --continue
    Successfully rebased and updated refs/heads/a1.
    
    Administrator@USERUSE-JBTODVE MINGW32 /i/kinggsoft/tt.txt (a1)
    $ git log --oneline
    22894ce (HEAD -> a1) a1*4
    56fec42 a1*3
    43cccc5 a1*2 no3
    e5f7eae a1 no2
    6e8da3d a1

## Git补充指令 ##

git remote rm origin

## 公众号 ##

![在这里插入图片描述][20200623005525799.jpg]

[watermark_type_ZmFuZ3poZW5naGVpdGk_shadow_10_text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L2hlbGxvd29ybGRkbQ_size_16_color_FFFFFF_t_70]: https://img-blog.csdnimg.cn/20200102222401319.jpg?x-oss-process=image/watermark,type_ZmFuZ3poZW5naGVpdGk,shadow_10,text_aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L2hlbGxvd29ybGRkbQ==,size_16,color_FFFFFF,t_70
[20200623005525799.jpg]: https://img-blog.csdnimg.cn/20200623005525799.jpg