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

前端 未结 6 1929
夕颜
夕颜 2020-12-07 15:14

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 com

6条回答
  •  失恋的感觉
    2020-12-07 15:53

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

    When you use fixup the message from that commit is discarded.

提交回复
热议问题