重命名合并的提交而不会丢失提交的父项 [英] Rename a merged commit without losing that commit's parents

问题描述

TL：DR：是否可以重命名合并（无快进合并）分支的提交 - 而不破坏历史记录？

我想重命名提交。就像 rebase --interactive HEAD〜5 。但是我想保持HEADs处于当前位置。 Rebase将平铺日志。

我正在使用功能分支

  * c3cb3ad  - 将分支'featureX'合并到开发中（15分钟前）< FOO> 
 | \ 
 | * d945c71  - 有东西（17分钟前）< FOO> 
 | * d4356f4  - 行内提交是aweosm< FOO> （27分钟前）< LSC> 
 | / 
 * 6ef9569  -  bla bla bla 
  

这就是我如何：
$ b $

 〜/ dev / foo /（develop）$ git checkout -b featureX 
〜/ dev / foo / （featureX）$ git的添加foo.html 
〜/开发/富/（featureX）$ git的承诺-m 在线提交的aweosm 
〜/开发/富/（featureX）$ git的结帐发展
〜/ dev / foo /（develop）$ git merge --no-ff featureX 
〜/ dev / foo /（develop）$ git branch -D featureX 
〜/ dev / foo /（develop）$ git add bar.html 
〜/ dev / foo /（develop）$ git commit -mLorem Ipsum
  

...哦，废话。我的提交信息中存在拼写错误！

解决方案使用 git rebase - preserve-merges

TL;DR: Is it possible to rename a commit from a merged (no fast forward merge) branch - without destroying history?

I want to rename a commit. Something like rebase --interactive HEAD~5. But I want to keep the HEADs in their current position. Rebase will flatten the log.

I'm using feature branches

*   c3cb3ad - Merge branch 'featureX' into develop (15 minutes ago) <FOO>
|\  
| * d945c71 - Did stuff (17 minutes ago) <FOO>
| * d4356f4 - inline commits are aweosm <FOO> (27 minutes ago) <LSC>
|/  
*   6ef9569 - bla bla bla

This is how I git:

~/dev/foo/ (develop)$ git checkout -b featureX
~/dev/foo/ (featureX)$ git add foo.html
~/dev/foo/ (featureX)$ git commit -m "inline commits are aweosm"
~/dev/foo/ (featureX)$ git checkout develop
~/dev/foo/ (develop)$ git merge --no-ff featureX
~/dev/foo/ (develop)$ git branch -D featureX
~/dev/foo/ (develop)$ git add bar.html
~/dev/foo/ (develop)$ git commit -m "Lorem Ipsum"

... oh crap. There's a typo in my commit message!

解决方案

Use git rebase with --preserve-merges

这篇关于重命名合并的提交而不会丢失提交的父项的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！