githug 第 45 关, 一开始对 git rebase -i 这个东西有误解, 记录一下正确的用法

ddmobadeMac-mini:git_hug ddmoba$ githug reset 45

********************************************************************************

*                                    Githug                                    *

********************************************************************************

resetting level

Name: rename_commit

Level: 45

Difficulty: ***

Correct the typo in the message of your first (non-root) commit.

ddmobadeMac-mini:git_hug ddmoba$

查找有拼写错误的那一条 commit

ddmobadeMac-mini:git_hug ddmoba$ git log

commit d30bc005638c278714faaa73f0fdc16052561750 (HEAD -> master)

Author: hangj <hangj@protonmail.com>

Date:   Fri Jun 29 11:35:05 2018 +0800

    Second commit

commit 4f1341ac9134225719e5d704e420160657e8c38e

Author: hangj <hangj@protonmail.com>

Date:   Fri Jun 29 11:35:05 2018 +0800

    First coommit

commit a632e3dfa31a06bcec9395c0690d43a3f2f09706

Author: hangj <hangj@protonmail.com>

Date:   Fri Jun 29 11:35:05 2018 +0800

    Initial commit

ddmobadeMac-mini:git_hug ddmoba$

First coommit // commit 写错了

git rebase -i parent_of_flawed_commit

ddmobadeMac-mini:git_hug ddmoba$ git rebase -i a632e3dfa31a06bcec9395c0690d43a3f2f09706

然后跳到

pick 4f1341a First coommit

pick d30bc00 Second commit

# Rebase a632e3d..d30bc00 onto a632e3d (2 commands)

#

# 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

# d, drop = remove commit

#

# 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

~

~

~

~

~

~

~

~

~

~

~

~

"~/git_hug/.git/rebase-merge/git-rebase-todo" 21L, 693C

编辑它,

r 4f1341a First coommit

pick d30bc00 Second commit

# Rebase a632e3d..d30bc00 onto a632e3d (2 commands)

#

# 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

# d, drop = remove commit

#

# 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

~

~

~

~

~

~

~

~

~

~

~

~

-- INSERT --

然后 :x 保存, 会跳到

First coommit

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

#

# Date:      Fri Jun 29 11:35:05 2018 +0800

#

# interactive rebase in progress; onto a632e3d

# Last command done (1 command done):

#    r 4f1341a First commit

# Next command to do (1 remaining command):

#    pick d30bc00 Second commit

# You are currently editing a commit while rebasing branch 'master' on 'a632e3d'.

#

# Changes to be committed:

#       new file:   file1

#

~

~

~

~

~

~

~

~

~

~

~

~

~

~

~

~

"~/git_hug/.git/COMMIT_EDITMSG" 17L, 520C

编辑它, 把 coommit 改成 commit

First commit

# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

#

# Date:      Fri Jun 29 11:35:05 2018 +0800

#

# interactive rebase in progress; onto a632e3d

# Last command done (1 command done):

#    r 4f1341a First commit

# Next command to do (1 remaining command):

#    pick d30bc00 Second commit

# You are currently editing a commit while rebasing branch 'master' on 'a632e3d'.

#

# Changes to be committed:

#       new file:   file1

#

~

~

~

~

~

~

~

~

~

~

~

~

~

~

~

~

-- INSERT --

然后 :x 保存, 跳到

ddmobadeMac-mini:git_hug ddmoba$ git rebase -i a632e3dfa31a06bcec9395c0690d43a3f2f09706

[detached HEAD ea3efe3] First commit

 Date: Fri Jun 29 11:35:05 2018 +0800

 1 file changed, 0 insertions(+), 0 deletions(-)

 create mode 100644 file1

Successfully rebased and updated refs/heads/master.

然后 git log 查看一下是否修改成功

ddmobadeMac-mini:git_hug ddmoba$ git log

commit 1f929783b1acb295aaf7b9dbe500629a1054484f (HEAD -> master)

Author: hangj <hangj@protonmail.com>

Date:   Fri Jun 29 11:35:05 2018 +0800

    Second commit

commit ea3efe310a6a03a232171bf664401f62a5dc024e

Author: hangj <hangj@protonmail.com>

Date:   Fri Jun 29 11:35:05 2018 +0800

    First commit

commit a632e3dfa31a06bcec9395c0690d43a3f2f09706

Author: hangj <hangj@protonmail.com>

Date:   Fri Jun 29 11:35:05 2018 +0800

    Initial commit

ddmobadeMac-mini:git_hug ddmoba$

done !!

githug rename_commit 修改已经commit但还没push的一条message的更多相关文章

  1. git 检查是否有commit到本地但还没push的代码

    使用 git status 命令可以得到以下结果 $ git status On branch dev_getTicketCnt Your branch is ahead of 'origin/mas ...

  2. Git 还没push 前可以做的事(转)

    Git 版本控制系統(3) 還沒 push 前可以做的事 转载:http://ihower.tw/blog/archives/2622   這一集要講的是:還沒 push 前可以做的壞事,也就是 re ...

  3. git删除已经提交的包含敏感信息的文件（还没提交到远程仓库）

    写好的代码已经提交了(但还没push到github),发现某个文件里包含密码.如果push的话,密码可就被公开了.如果在代码里改掉密码,再commit一次,也不行,历史提交记录还是会上传到github ...

  4. 谁还没遇上过NoClassDefFoundError咋地——浅谈字节码生成与热部署

    谁还没遇上过NoClassDefFoundError咋地--浅谈字节码生成与热部署 前言 在Java程序员的世界里,NoClassDefFoundError是一类相当令人厌恶的错误,因为这类错误通常非 ...

  5. C-Lodop提示“网页还没下载完毕，请稍等一下再操作.”

    该提示在Lodop旧版本中是: 提示"WebSocket没准备好,点确定继续",提示“C-Lodop没准备好”,新版本修改了该提示的描述“网页还没下载完毕,请稍等一下再操作.”,让 ...

  6. .Net Actor 服务端开发框架，Newbe.Claptrap 项目周报 1 - 还没轮影，先用轮跑

    Newbe.Claptrap 项目周报 1,第一周代码写了一点.但主要还是考虑理论可行性. 第一次接触本框架的读者,可以先点击此处阅读本框架相关的基础理论和工作原理. 周报是啥? 成功的开源作品,离不 ...

  7. 不会吧，你连Java 多线程线程安全都还没搞明白，难怪你面试总不过

    什么是线程安全? 当一个线程在同一时刻共享同一个全局变量或静态变量时,可能会受到其他线程的干扰,导致数据有问题,这种现象就叫线程安全问题. 为什么有线程安全问题? 当多个线程同时共享,同一个全局变量或 ...

  8. gRPC趁现在还没大火，抢先了解一下

    前言 系统分布式已经成为程序员的家常,将大型单体划分为相对简单的小模块,分散系统能力,提升系统扩展性.功能模块复用性等:各功能模块之间肯定会有很多数据共享和交互的应用场景,那就避免不了各模块之间的通信 ...

  9. 升级过log4j，却还没搞懂log4j漏洞的本质？

    摘要:log4j远程代码漏洞问题被大范围曝光后已经有一段时间了,今天完整讲清JNDI和RMI以及该漏洞的深层原因. 本文分享自华为云社区<升级过log4j,却还没搞懂log4j漏洞的本质?为你完 ...

随机推荐

  1. 27.Hibernate-缓存和懒加载.md

    目录 1.一级缓存 2.缓存的有效性 3.list和iterator缓存的区别 4.懒加载 4.1get 4.2load 1.一级缓存 Hibernate中一级缓存是Session缓存,有效范围在Se ...

  2. mysql授权远程访问

    mysql> GRANT ALL PRIVILEGES ON *.* TO 'root'@'%'IDENTIFIED BY '123456' WITH GRANT OPTION; Query O ...

  3. 【VBA】杨辉三角

    Private Sub Workbook_Open() Dim loopA As Integer Dim loopB As Integer Dim loopNum As Integer Dim top ...

  4. SpringCloud Feign context-path踩到的坑

    最近在使用SpringCloud的context-path时,遇到了一些坑,记录一下. server.context-path(上下文) 服务提供者的application配置文件中有一个属性叫ser ...

  5. c++ 面试题(算法类)

    1,从无序的数据流中找到其中位数:(用大根堆和小根堆来实现) float getMidimum(vector<int>& nums) { priority_queue<int ...

  6. 使用 Composer 安装Laravel扩展包的几种方法

    使用 Composer 安装Laravel扩展包的几种方法 以下的三种方法都是需要你在项目的根目录运行 第一种:composer install 如有 composer.lock 文件,直接安装,否则 ...

  7. 在Laravel中使用mongoDB

    https://blog.csdn.net/weixin_38682852/article/details/80840678?utm_source=blogxgwz1 https://blog.csd ...

  8. 10.13 新版本go on~

    上午1.5 终审 and 排期 合同管理那边又是切换选项时各种联动,我第一想法是 好麻烦,不想做这个...第二想法才是给我做吧 锻炼锻炼我 然后 分任务的时候 分给我了,,哈哈 开心 虽然我没想躲 但 ...

  9. 360. Sort Transformed Array二元一次方程返回大数序列

    ［抄题］: Given a sorted array of integers nums and integer values a, b and c. Apply a quadratic functio ...

  10. viewstate？

    用于存放数据,可永久保存,存放在页面的隐藏控件里      支持string,integer,array,boolean,ArrayList,hashtable类型,使用viewstate会增加页面h ...