git实战-6、变更message信息

逃离我推掉我的手 2021-09-28 06:36 269阅读 0赞

# git实战-6、变更message信息 #

### 文章目录 ###

*  git实战-6、变更message信息
 *   *  对最近提交的commit变更message
     *  为什么 rebase -i git 会分离头指针
     *  使用rebase变更commit提交的message(不提倡使用rebase命令)
     *  注意
     *  怎么把间隔的几个commit 合并成一个commit？

## 对最近提交的commit变更message ##

git commit --amend

[app@iz8vb2knpxzlk1syb8dy3cz detach_head_test]$ git commit --amend 
    [fix_readme 6102802] test2_amend
     1 file changed, 1 insertion(+)
     create mode 100644 readme2.md
    [app@iz8vb2knpxzlk1syb8dy3cz detach_head_test]$ git log -1
    commit 61028023b8b101edca22f4f09237ff867d690512
    Author: globaltest <globaltest@xx.com>
    Date:   Tue Feb 26 13:20:49 2019 +0800
    
        test2_amend

## 为什么 rebase -i git 会分离头指针 ##

git rebase工作的过程中，就是用了分离头指针。rebase意味着基于新base的commit来变更部分commits。它处理的时候，把HEAD指向base的commit，此时如果该commit没有对应branch，就处于分离头指针的状态，然后重新一个一个生成新的commit，当rebase创建完最后一个commit后，结束分离头状态，Git让变完基的分支名指向HEAD。

## 使用rebase变更commit提交的message(不提倡使用rebase命令) ##

1、假如我们要变更test2\_amend3 为test2\_amend5，我们需要rebase 到test2\_amend3的父节点进行变更使用命令

[app@iz8vb2knpxzlk1syb8dy3cz detach_head_test]$ git log
    commit 86e2cb61d736f42a173af3c17f2e2c8354c9883a
    Author: globaltest <globaltest@xx.com>
    Date:   Tue Feb 26 13:20:49 2019 +0800
    
        test2_amend3
    
    commit 938d88743c5cab96b895549699467afc3a460684
    Author: globaltest <globaltest@xx.com>
    Date:   Tue Feb 26 13:20:24 2019 +0800
    
        test1

2、使用命令git rebase -i 938d88743c

[app@iz8vb2knpxzlk1syb8dy3cz detach_head_test]$ git rebase -i 938d88743c

3、将 pick 51f65b4 test2\_amend3 改为 r 51f65b4 test2\_amend3

r 51f65b4 test2_amend3
    
    # Rebase 938d887..51f65b4 onto 938d887
    #
    # Commands:
    # p, pick = use commit
    # r, reword = use commit, but edit the commit message
    # e, edit = use commit, but stop for amending
    # s, squash = use commit, but meld into previous commit
    # f, fixup = like "squash", but discard this commit's log message
    # x, exec = run command (the rest of the line) using shell
    #
    # These lines can be re-ordered; they are executed from top to bottom.
    #
    # If you remove a line here THAT COMMIT WILL BE LOST.
    #
    # However, if you remove everything, the rebase will be aborted.
    #
    # Note that empty commits are commented out

4、进行该commit结点信息编辑将test2\_amend3改为test2\_amend5

test2_amend5
    
    # Please enter the commit message for your changes. Lines starting
    # with '#' will be ignored, and an empty message aborts the commit.
    # HEAD detached from 938d887
    # You are currently editing a commit while rebasing branch 'fix_readme' on '938d887'.
    #
    # Changes to be committed:
    # (use "git reset HEAD^1 <file>..." to unstage)
    #
    # new file: readme2.md

5、查看变更后的git log ，当前test2\_amend5的SHA ID变更了

[app@iz8vb2knpxzlk1syb8dy3cz detach_head_test]$ git rebase -i 938d88743c
    [detached HEAD 3c69b34] test2_amend5
     1 file changed, 1 insertion(+)
     create mode 100644 readme2.md
    Successfully rebased and updated refs/heads/fix_readme.
    [app@iz8vb2knpxzlk1syb8dy3cz detach_head_test]$ git log
    commit 3c69b34590fee5482bbb9b34f65c65358d2ac2b9
    Author: globaltest <globaltest@xx.com>
    Date:   Tue Feb 26 13:20:49 2019 +0800
    
        test2_amend5
    
    commit 938d88743c5cab96b895549699467afc3a460684
    Author: globaltest <globaltest@xx.com>
    Date:   Tue Feb 26 13:20:24 2019 +0800
    
        test1

## 注意 ##

对于团队中公用的分支，例如发布分支等，禁用 rebase，因为这样会破坏历史的 commit 信息的，将来要溯源、基于构建历史拉取补丁分支等就会带来极大不便  
作者回复: 说的很好。rebase通常用在还没有提交到集成分支之前。

[app@iz8vb2knpxzlk1syb8dy3cz my-resp]$ git log
    commit e810d486f59cdb5f60053b5066ac61accee84c80
    Author: localtest <localtest@xx.com>
    Date:   Mon Feb 25 17:36:02 2019 +0800
    
        mv file
    
    commit 8c11d1383641d622822e847e754c5b718f55aabc
    Author: localtest <localtest@xx.com>
    Date:   Mon Feb 25 16:27:27 2019 +0800
    
        test3
    
    commit 4d1b0c5ac60cb1368a513b4448f3da47fbe5d701
    Author: yunfeng <330410708@qq.com>
    Date:   Mon Feb 25 16:11:40 2019 +0800
    
        test1
    
    commit c8eafbac64d2f5f37074c7fbc0c3a164ca4c5d06
    Author: yunfeng <330410708@qq.com>
    Date:   Mon Feb 25 16:09:18 2019 +0800
    
        test
    [app@iz8vb2knpxzlk1syb8dy3cz my-resp]$ git rebase -i c8eafbac6

pick 4d1b0c5 test1
    s 8c11d13 test3
    s e810d48 mv file
    
    # Rebase c8eafba..e810d48 onto c8eafba
    #
    # Commands:
    #  p, pick = use commit
    #  r, reword = use commit, but edit the commit message
    #  e, edit = use commit, but stop for amending
    #  s, squash = use commit, but meld into previous commit
    #  f, fixup = like "squash", but discard this commit's log message
    #  x, exec = run command (the rest of the line) using shell
    #
    # These lines can be re-ordered; they are executed from top to bottom.
    #
    # If you remove a line here THAT COMMIT WILL BE LOST.
    #
    # However, if you remove everything, the rebase will be aborted.
    #
    # Note that empty commits are commented out

# This is a combination of 3 commits.
    combination message test
    # The first commit's message is:
    test1
    
    # This is the 2nd commit message:
    
    test3
    
    # This is the 3rd commit message:
    
    mv file
    
    # Please enter the commit message for your changes. Lines starting
    # with '#' will be ignored, and an empty message aborts the commit.
    #
    # Author:    yunfeng <330410708@qq.com>
    #
    # HEAD detached from 4d1b0c5
    # You are currently editing a commit while rebasing branch 'master' on 'c8eafba'.
    #
    # Changes to be committed:
    #   (use "git reset HEAD^1 <file>..." to unstage)
    #
    #       renamed:    readme -> readme.md
    #       new file:   readme2.md
    #       new file:   readme3

[app@iz8vb2knpxzlk1syb8dy3cz my-resp]$ git log
    commit 5dc575095a8da1d01aa2e14b159bc22dcb9a5a3f
    Author: yunfeng <330410708@qq.com>
    Date:   Mon Feb 25 16:11:40 2019 +0800
    
        combination message test
        test1
        
        test3
        
        mv file
    
    commit c8eafbac64d2f5f37074c7fbc0c3a164ca4c5d06
    Author: yunfeng <330410708@qq.com>
    Date:   Mon Feb 25 16:09:18 2019 +0800
    
        test

## 怎么把间隔的几个commit 合并成一个commit？ ##

当前有test1、test2、test3、test4四个提交记录，现在合并test2、test4，删除test3.

1、查看git log 状态

[app@iz8vb2knpxzlk1syb8dy3cz test_commmit]$ git log
    commit 0ed7d8050d9a05b7d9792759d6438e9ca0cfdb5d
    Author: globaltest <globaltest@xx.com>
    Date:   Tue Feb 26 18:02:10 2019 +0800
    
        test4
    
    commit 39ad22ea35f577f4cba7b36cfc3e7a473d0ad938
    Author: globaltest <globaltest@xx.com>
    Date:   Tue Feb 26 18:01:14 2019 +0800
    
        test3
    
    commit 837b73dcd466931d53bdcd245df5c886a1e7adf6
    Author: globaltest <globaltest@xx.com>
    Date:   Tue Feb 26 18:01:03 2019 +0800
    
        test2
    
    commit 7ac1a19c5a4a5dcbd48e8340c4e428e3f6cb80b3
    Author: globaltest <globaltest@xx.com>
    Date:   Tue Feb 26 18:00:46 2019 +0800
    
        test1

2、输入以下命令，从test2的父commit进行rebase

git rebase -i 7ac1a19c

pick 837b73d test2
    pick 39ad22e test3
    pick 0ed7d80 test4

改为

s 837b73d test2
    pick 39ad22e test3
    s 0ed7d80 test4

git log --graph