blocks|key|3018689|text|我不知道Git扩展具体用它做了什么，但git+rebase有一个选项来自动压缩或修复带有压缩的提交！或者修整！前缀分别为：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3018690|+++--autosquash,+--no-autosquash
+++++++When+the+commit+log+message+begins+with+"squash!+..."+(or+"fixup!
+++++++..."),+and+there+is+a+commit+whose+title+begins+with+the+same+...,
+++++++automatically+modify+the+todo+list+of+rebase+-i+so+that+the+commit
+++++++marked+for+squashing+comes+right+after+the+commit+to+be+modified,
+++++++and+change+the+action+of+the+moved+commit+from+pick+to+squash+(or
+++++++fixup).|code-block|syntax|javascript|3018691|压缩和修复的不同之处在于，在rebase期间，squash操作将提示您合并原始和压缩提交的消息，而fixup操作将保留原始消息并丢弃修复提交的消息。|3018692|entityMap^0|J|A|0|0|N|6|1D|5|0^^$0|@$1|2|3|4|5|6|7|O|8|@$9|P|A|Q|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|R|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|S|8|@$9|T|A|U|B|C]|$9|V|A|W|B|C]]|D|@]|E|$]]|$1|M|3|-4|5|6|7|X|8|@]|D|@]|E|$]]]|N|$]]

I do not know what Git Extensions does with it specifically, but <code>git rebase</code> has an option to automatically squash or fixup commits with squash! or fixup! prefixes, respectively:

<pre><code> --autosquash, --no-autosquash
 When the commit log message begins with "squash! ..." (or "fixup!
 ..."), and there is a commit whose title begins with the same ...,
 automatically modify the todo list of rebase -i so that the commit
 marked for squashing comes right after the commit to be modified,
 and change the action of the moved commit from pick to squash (or
 fixup).
</code></pre>

The difference between squash and fixup is that during the rebase, the <code>squash</code> operation will prompt you to combine the messages of the original and the squash commit, whereas the <code>fixup</code> operation will keep the original message and discard the message from the fixup commit.

blocks|key|187974|text|简单地说，当对一系列commit进行重构时，每个commit标记为一个squash，这样您就有机会将其消息用作pick或reword+commit消息的一部分。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|187975|当您使用fixup时，来自该提交的消息将被丢弃。|187976|entityMap^0|Z|6|1J|4|1O|6|0|4|5|0^^$0|@$1|2|3|4|5|6|7|J|8|@$9|K|A|L|B|C]|$9|M|A|N|B|C]|$9|O|A|P|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|Q|8|@$9|R|A|S|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|6|7|T|8|@]|D|@]|E|$]]]|I|$]]

Simply put, when rebasing a series of commits, each commit marked as a <code>squash</code>, gives you the opportunity to use its message as part of a <code>pick</code> or <code>reword</code> commit message.

When you use <code>fixup</code> the message from that commit is discarded.

blocks|key|3018770|text|来自git-rebase+doc,+"interactive+mode"+section|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|3018771|3018772|如果您想将两个或多个提交合并为一个提交，请将第二个提交和后续提交的命令"pick“替换为"squash”或"fixup“。如果提交具有不同的作者，则折叠提交将被归因于第一次提交的作者。建议的合并提交的提交消息是第一次提交的提交消息和带有"squash“命令的提交消息的串联，但省略了带有"fixup”命令的提交的提交消息。|blockquote|3018773|3018774|entityMap|0|LINK|mutability|MUTABLE|url|https://git-scm.com/docs/git-rebase#_interactive_mode^0|2|16|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Q|8|@]|9|@$A|R|B|S|1|T]]|C|$]]|$1|D|3|-4|5|6|7|U|8|@]|9|@]|C|$]]|$1|E|3|F|5|G|7|V|8|@]|9|@]|C|$]]|$1|H|3|-4|5|6|7|W|8|@]|9|@]|C|$]]|$1|I|3|-4|5|6|7|X|8|@]|9|@]|C|$]]]|J|$K|$5|L|M|N|C|$O|P]]]]

From <a href="https://git-scm.com/docs/git-rebase#_interactive_mode" rel="nofollow noreferrer">git-rebase doc, "interactive mode" section</a>:

<blockquote>
 If you want to fold two or more commits into one, replace the command "pick" for the second and subsequent commits with "squash" or "fixup". If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the "squash" command, but omits the commit messages of commits with the "fixup" command.
</blockquote>

blocks|key|186021|text|我对git扩展进行了修补，但无法让它将多个提交压缩为一个提交。为此，我不得不求助于命令行，并发现this+post很有帮助|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|186022|git+rebase+-i+Head~2|code-block|syntax|javascript|186023|这是交互式的rebase，注意以下几点：|186024|这里的|186025|~2是指您希望在此操作中涉及的提交次数，包括您必须编辑随后的交互式编辑窗口的当前head|unordered-list-item|186026|，将第一项保留为"pick“，并将后续行替换为"squash”。如果这是不透明的，上面链接中的说明就会清晰得多。|186027|186028|entityMap|0|LINK|mutability|MUTABLE|url|https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/^0|1C|9|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|10|8|@]|9|@$A|11|B|12|1|13]]|C|$]]|$1|D|3|E|5|F|7|14|8|@]|9|@]|C|$G|H]]|$1|I|3|J|5|6|7|15|8|@]|9|@]|C|$]]|$1|K|3|L|5|6|7|16|8|@]|9|@]|C|$]]|$1|M|3|N|5|O|7|17|8|@]|9|@]|C|$]]|$1|P|3|Q|5|O|7|18|8|@]|9|@]|C|$]]|$1|R|3|-4|5|6|7|19|8|@]|9|@]|C|$]]|$1|S|3|-4|5|6|7|1A|8|@]|9|@]|C|$]]]|T|$U|$5|V|W|X|C|$Y|Z]]]]

I tinkered with git extensions and couldn't get it to squash many commits into one. To do that, I had to resort to the command line and found <a href="https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/" rel="nofollow">this post</a> helpful

<pre><code>git rebase -i Head~2
</code></pre>

This is interactive rebase, and note the following:

<ul>
<li>~2 here refers to how many commits you want to involve in this operation, including the current head</li>
<li>You have to edit the subsquent interactive edit window, leave the first item as "pick" and replace subsequent lines with "squash". The instructions in the link above are much clearer if this is opaque.</li>
</ul>

blocks|key|186030|text|为什么不去问git本身呢？当您使用git-bash重新建立基础时，它会说：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|186031|pick+512b1d7+(some+comment)
#+Rebase+621b2e4..512b1d7+onto+621b2e4+(1+command)
#
#+Commands:
#+p,+pick+<commit>+=+use+commit
#+r,+reword+<commit>+=+use+commit,+but+edit+the+commit+message
#+e,+edit+<commit>+=+use+commit,+but+stop+for+amending
#+s,+squash+<commit>+=+use+commit,+but+meld+into+previous+commit
#+f,+fixup+<commit>+=+like+"squash",+but+discard+this+commit's+log+message
#+x,+exec+<command>+=+run+command+(the+rest+of+the+line)+using+shell
#+d,+drop+<commit>+=+remove+commit
#+l,+label+<label>+=+label+current+HEAD+with+a+name
#+t,+reset+<label>+=+reset+HEAD+to+a+label
#+m,+merge+[-C+<commit>+%7C+-c+<commit>]+<label>+[#+<oneline>]
#+.+++++++create+a+merge+commit+using+the+original+merge+commit's
#+.+++++++message+(or+the+oneline,+if+no+original+merge+commit+was
#+.+++++++specified).+Use+-c+<commit>+to+reword+the+commit+message.
#
#+These+lines+can+be+re-ordered;+they+are+executed+from+top+to+bottom.
#
#+If+you+remove+a+line+here+THAT+COMMIT+WILL+BE+LOST.
D:/code/fenixito-legacy-api/.git/rebase-merge/git-rebase-todo+[unix]+(11:57+23/10/2019)+++++++++++++++++++++++++++++++++++++++++1,1+start
"D:/code/xxx/.git/rebase-merge/git-rebase-todo"+[UNIX]+27L,+1170C|code-block|syntax|javascript|186032|所以你可以看到：|186033|压缩%25+s，|186034|+=使用提交，但合并到以前的提交中|blockquote|186035|186036|fixup+=+like+"squash"，但丢弃此提交的日志消息|186037|entityMap^0|H|8|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@$9|X|A|Y|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|Z|8|@]|D|@]|E|$I|J]]|$1|K|3|L|5|6|7|10|8|@]|D|@]|E|$]]|$1|M|3|N|5|6|7|11|8|@]|D|@]|E|$]]|$1|O|3|P|5|Q|7|12|8|@]|D|@]|E|$]]|$1|R|3|-4|5|6|7|13|8|@]|D|@]|E|$]]|$1|S|3|T|5|6|7|14|8|@]|D|@]|E|$]]|$1|U|3|-4|5|6|7|15|8|@]|D|@]|E|$]]]|V|$]]

Why not ask git itself?
When you rebase with <code>git-bash</code>, it says:
<pre class="lang-sh prettyprint-override"><code>pick 512b1d7 (some comment)
# Rebase 621b2e4..512b1d7 onto 621b2e4 (1 command)
#
# Commands:
# p, pick &lt;commit&gt; = use commit
# r, reword &lt;commit&gt; = use commit, but edit the commit message
# e, edit &lt;commit&gt; = use commit, but stop for amending
# s, squash &lt;commit&gt; = use commit, but meld into previous commit
# f, fixup &lt;commit&gt; = like &quot;squash&quot;, but discard this commit's log message
# x, exec &lt;command&gt; = run command (the rest of the line) using shell
# d, drop &lt;commit&gt; = remove commit
# l, label &lt;label&gt; = label current HEAD with a name
# t, reset &lt;label&gt; = reset HEAD to a label
# m, merge [-C &lt;commit&gt; | -c &lt;commit&gt;] &lt;label&gt; [# &lt;oneline&gt;]
# . create a merge commit using the original merge commit's
# . message (or the oneline, if no original merge commit was
# . specified). Use -c &lt;commit&gt; to reword the commit message.
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
D:/code/fenixito-legacy-api/.git/rebase-merge/git-rebase-todo [unix] (11:57 23/10/2019) 1,1 start
&quot;D:/code/xxx/.git/rebase-merge/git-rebase-todo&quot; [UNIX] 27L, 1170C
</code></pre>
So you see:
<blockquote>
s, squash = use commit, but meld into previous commit
f, fixup = like &quot;squash&quot;, but discard this commit's log message
</blockquote>

blocks|key|187585|text|如果问题是git中的squash和fixup在执行git+rebase+--interactive时有什么不同，那么答案是提交消息。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|BOLD|entityRanges|data|187586|187587|+s,+squash+<commit>+=使用提交，但合并到以前的提交中|blockquote|187588|187589|f,+fixup+<commit>+=+like“”，放弃此提交的日志消息|187590|187591|187592|例如：|187593|pick+22a4667+father+commit+message
squash+46d7c0d+child+commit+message+#+case+1
#+fixup+46d7c0d+child+commit+message+#+case+2|code-block|syntax|javascript|187594|在情况1中，重新建立基础后的提交消息将是：|187595|father+commit+message

child+commit+message|187596|而案例2中的提交消息是：|187597|father+commit+message
#+no+sub+messages|187598|entityMap|0|LINK|mutability|MUTABLE|url|https://git-scm.com/docs/git-rebase^0|A|6|H|5|1P|4|P|O|0|0|0|1|I|0|0|0|H|P|C|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|1C|8|@$9|1D|A|1E|B|C]|$9|1F|A|1G|B|C]|$9|1H|A|1I|B|D]]|E|@$9|1J|A|1K|1|1L]]|F|$]]|$1|G|3|-4|5|6|7|1M|8|@]|E|@]|F|$]]|$1|H|3|I|5|J|7|1N|8|@$9|1O|A|1P|B|C]]|E|@]|F|$]]|$1|K|3|-4|5|6|7|1Q|8|@]|E|@]|F|$]]|$1|L|3|M|5|6|7|1R|8|@$9|1S|A|1T|B|C]|$9|1U|A|1V|B|D]]|E|@]|F|$]]|$1|N|3|-4|5|6|7|1W|8|@]|E|@]|F|$]]|$1|O|3|-4|5|6|7|1X|8|@]|E|@]|F|$]]|$1|P|3|Q|5|6|7|1Y|8|@]|E|@]|F|$]]|$1|R|3|S|5|T|7|1Z|8|@]|E|@]|F|$U|V]]|$1|W|3|X|5|6|7|20|8|@]|E|@]|F|$]]|$1|Y|3|Z|5|T|7|21|8|@]|E|@]|F|$U|V]]|$1|10|3|11|5|6|7|22|8|@]|E|@]|F|$]]|$1|12|3|13|5|T|7|23|8|@]|E|@]|F|$U|V]]|$1|14|3|-4|5|6|7|24|8|@]|E|@]|F|$]]]|15|$16|$5|17|18|19|F|$1A|1B]]]]

If the question is what's the difference between <code>squash</code> and <code>fixup</code> in git when doing <a href="https://git-scm.com/docs/git-rebase" rel="noreferrer">git rebase --interactive</a>, then the answer is the commit message.
<blockquote>
<code>s, squash &lt;commit&gt;</code> = use commit, but meld into previous commit
<code>f, fixup &lt;commit&gt;</code> = like &quot;squash&quot;, but discard this commit's log message
</blockquote>
<hr />
For example:
<pre class="lang-sh prettyprint-override"><code>pick 22a4667 father commit message
squash 46d7c0d child commit message # case 1
# fixup 46d7c0d child commit message # case 2
</code></pre>
The commit message after rebasing in case 1 would be:
<pre><code>father commit message

child commit message
</code></pre>
while the commit message in case 2 is:
<pre><code>father commit message
# no sub messages
</code></pre>

blocks|key|3019059|text|squash和fixup都允许通过它们各自的diff引入代码更改。(通常不会提及)|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|3019060|squash和fixup之间的区别在于如何处理提交消息。|3019061|在fixup的情况下，原始提交消息保持不变，fixup提交消息中的任何文本都被忽略(随意转储)。|3019062|在squash的情况下，两个提交消息被一个接一个地组合(‘融合’)，并提供给用户的编辑器，以便它们可以按照用户的需要被合并/融合在一起。|3019063|初始组合消息(squash)将包含注释标记，显示消息的开始和结束位置。可以应用多个squash和fixup。|3019064|在讨论小的代码更正(不需要更改消息)时，术语可能会令人困惑，因为通常有人可能会认为代码是“挤入”的，而实际上并不需要squash。|3019065|entityMap^0|0|6|7|5|0|0|6|7|5|0|1|5|M|5|0|1|6|0|15|6|1C|5|0|1M|6|0^^$0|@$1|2|3|4|5|6|7|R|8|@$9|S|A|T|B|C]|$9|U|A|V|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|W|8|@$9|X|A|Y|B|C]|$9|Z|A|10|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|11|8|@$9|12|A|13|B|C]|$9|14|A|15|B|C]]|D|@]|E|$]]|$1|J|3|K|5|6|7|16|8|@$9|17|A|18|B|C]]|D|@]|E|$]]|$1|L|3|M|5|6|7|19|8|@$9|1A|A|1B|B|C]|$9|1C|A|1D|B|C]]|D|@]|E|$]]|$1|N|3|O|5|6|7|1E|8|@$9|1F|A|1G|B|C]]|D|@]|E|$]]|$1|P|3|-4|5|6|7|1H|8|@]|D|@]|E|$]]]|Q|$]]

Both <code>squash</code> and <code>fixup</code> will allow code changes to be introduced by their respective diff's. (not normally mentioned)
The distinction between <code>squash</code> and <code>fixup</code> is in how the commit messages are treated.
In the <code>fixup</code> case the original commit message is kept, unchanged, and any text within the <code>fixup</code> commit message is ignored (unceremoniously dumped).
In the <code>squash</code> case both commit messages are combined ('melded'), one after the other, and offered to the user's editor, so that they can be amalgamated/fused together as desired by the user.
The initial combined message (squash) will contain comment marks showing where the messages start and end. Multiple <code>squash</code> and <code>fixup</code>s can be applied.
The terminology can be confusing when discussing small code corrections (without need to change the message) as often one may suggest that the code is 'squeezed' in, when a <code>squash</code> isn't actually required.

I've been using Git Extensions for a while now (it's awesome!) but I haven't found a simple answer to the following:

Sometimes, when typing a commit message, a make a typo. My friend showed me how to fix it the following way (in Git Extentions):

<blockquote>
 Right-Click on the commit > Advanced > Fixup commit
</blockquote>

<img src="https://i.stack.imgur.com/XK6Jt.png" alt="enter image description here">

Then I simply check the box "Amend" and rewrite my message and voila! My commit message is fixed.

However this other option "Squash commit"... I have always wondered what it does?!

My question is:

Would someone simply explain me what is the exact difference between Squash commit and Fixup commit in Git/Git Extentions? They look kind of... "similar" to me:
<img src="https://i.stack.imgur.com/qIHAX.png" alt="enter image description here">
<img src="https://i.stack.imgur.com/FFuPd.png" alt="enter image description here">

What's the difference between "squash" and "fixup" in Git/Git Extension?

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

教程

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云智能顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

聚焦“写作效率、视觉美观与运行性能”三方面进行全面升级，为您提供更高效、稳定的创作环境

社区富文本&Markdown编辑器全新改版上线，欢迎大家体验!

诚挚邀请您参与本次调研，分享您的真实使用感受与建议。您的反馈至关重要，感谢您的支持与参与！

社区新版编辑器体验调研

我使用Git Extensions已经有一段时间了(太棒了！)但我还没有找到一个简单的答案来回答以下问题：有时，在输入提交消息时，会出现打字错误。我的朋友向我展示了如何通过以下方式修复它(在Git扩展中)：右键单击commit > Advanced > Fixup commit​​然后我只需勾选“修改”框并重写我的消息...

问Git/Git扩展中的"squash“和"fixup”有什么区别？
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问Git/Git扩展中的"squash“和"fixup”有什么区别？EN