美文网首页
2019-06-17 把不连续的commit合并成1个

2019-06-17 把不连续的commit合并成1个

作者: 张大志的博客 | 来源:发表于2019-06-17 15:36 被阅读0次
    [root@VM_0_3_centos project]# git log
    commit 58a63bf128c502c65e488b0fd25f7bdd27f84545
    Author: eagle <307509855@qq.com>
    Date:   Mon Jun 17 15:03:46 2019 +0800
    
        add  index.html
    
    commit 37c34f5ac9afa9481a2281e6c51d013f237e51d0
    Author: eagle <307509855@qq.com>
    Date:   Fri Jun 14 15:35:09 2019 +0800
    
        hebingzhongjianliangge
        
        add test file
        
        add style.css
    
    commit 7be55de3dc794d424ef62332d983839bc119f882
    Author: eagle <307509855@qq.com>
    Date:   Fri Jun 14 14:31:36 2019 +0800
    
        move readme.txt readme.md
    
    commit 72bf4683bc7f8405f0ab3c976b62abffe4b487b4
    Author: eagle <307509855@qq.com>
    Date:   Fri Jun 14 14:29:20 2019 +0800
    
        add readme.txt
    [root@VM_0_3_centos project]# git rebase -i 72bf4683 
    pick 7be55de move readme.txt readme.md
    s 58a63bf add  index.html  #将index.html合并到move readme.txt readme.md
    pick 37c34f5 hebingzhongjianliangge
    [root@VM_0_3_centos project]# git log
    commit 455e4db1be0231f1992b266cbe849ab07fcc8da0
    Author: eagle <307509855@qq.com>
    Date:   Fri Jun 14 15:35:09 2019 +0800
    
        hebingzhongjianliangge
        
        add test file
        
        add style.css
    
    commit 69c3d1b0ff57b68d7a758aaaf400224241824e80
    Author: eagle <307509855@qq.com>
    Date:   Fri Jun 14 14:31:36 2019 +0800
    
        hebing index.html readme.md
        
        move readme.txt readme.md
        
        add  index.html
    
    commit 72bf4683bc7f8405f0ab3c976b62abffe4b487b4
    Author: eagle <307509855@qq.com>
    Date:   Fri Jun 14 14:29:20 2019 +0800
    
        add readme.txt
    

    相关文章

      网友评论

          本文标题:2019-06-17 把不连续的commit合并成1个

          本文链接:https://www.haomeiwen.com/subject/ecbafctx.html