有没有办法在 Gitlab CE UI 上变基和压缩提交?
Is there a way to rebase and squash commits on Gitlab CE UI?
有没有办法 rebase
和 squash
在 Gitlab CE UI 上提交,而不是通过命令行使用交互模式?
它似乎在 issue EE 150 to the EE PR 1024 中实现,用于允许压缩合并请求(GitLab EE 8.17)。
请参阅文档(目前为 EE)“Squash and merge”。
CE issue 4106 提倡将该功能迁移回 CE。
2018 年 2 月更新,一年后:如 Jürgen Steinblock adds :
Great news!
It looks like this will make it into 10.8: see issue 34591: "Squash and merge in GitLab Libre (CE)".
2018 年 6 月更新:Jürgen Steinblock confirms :
GitLab 11 now includes Squash and merge for all editions, even Core (You have to manually enable a checkbox for existing merge requests and while creating new ones)
这会有所帮助 keeping the Git history clean!
随着 GitLab 13.3(2020 年 8 月),有一个新选项对 squash 提交很有趣:
Squash Commits Options
Squashing commits in Git is a great way to combine several commits into a single one.
It’s great for grouping several commits, which by themselves may provide little historical value, into a single large commit before pushing upstream.
Pushing a single commit allows for a more meaningful commit message, as well as ensuring the group of commits provides a “green” continuous integration pipeline.
In GitLab 13.3 we are adding configurable defaults for squashing commits, allowing project maintainers to configure the option to suit their preferred workflow.
Because changing squash configuration may introduce unwanted behavior, configuration has not been changed for new or existing projects. With 314 upvotes , this is one of the most highly requested improvements by the community and we hope it allows more users to use this powerful feature.
See Documentation and Issue.
目前(从版本 11.4.4 开始)使用 Rebase 时,GitLab(任何版本)似乎都不支持 Squash。这可能是由于 Squash 作为 Rebase "interactive" 功能的一部分的工作方式(参见命令 "rebase -i")。
有没有办法 rebase
和 squash
在 Gitlab CE UI 上提交,而不是通过命令行使用交互模式?
它似乎在 issue EE 150 to the EE PR 1024 中实现,用于允许压缩合并请求(GitLab EE 8.17)。
请参阅文档(目前为 EE)“Squash and merge”。
CE issue 4106 提倡将该功能迁移回 CE。
2018 年 2 月更新,一年后:如 Jürgen Steinblock adds
Great news!
It looks like this will make it into 10.8: see issue 34591: "Squash and merge in GitLab Libre (CE)".
2018 年 6 月更新:Jürgen Steinblock confirms
GitLab 11 now includes Squash and merge for all editions, even Core (You have to manually enable a checkbox for existing merge requests and while creating new ones)
这会有所帮助 keeping the Git history clean!
随着 GitLab 13.3(2020 年 8 月),有一个新选项对 squash 提交很有趣:
Squash Commits Options
Squashing commits in Git is a great way to combine several commits into a single one.
It’s great for grouping several commits, which by themselves may provide little historical value, into a single large commit before pushing upstream.
Pushing a single commit allows for a more meaningful commit message, as well as ensuring the group of commits provides a “green” continuous integration pipeline.In GitLab 13.3 we are adding configurable defaults for squashing commits, allowing project maintainers to configure the option to suit their preferred workflow.
Because changing squash configuration may introduce unwanted behavior, configuration has not been changed for new or existing projects. With 314 upvotes , this is one of the most highly requested improvements by the community and we hope it allows more users to use this powerful feature.
See Documentation and Issue.
目前(从版本 11.4.4 开始)使用 Rebase 时,GitLab(任何版本)似乎都不支持 Squash。这可能是由于 Squash 作为 Rebase "interactive" 功能的一部分的工作方式(参见命令 "rebase -i")。