Skip to content

Mention @bors squash in squashing documentation#2785

Merged
Kobzol merged 1 commit intorust-lang:mainfrom
Kobzol:bors-squash
Mar 1, 2026
Merged

Mention @bors squash in squashing documentation#2785
Kobzol merged 1 commit intorust-lang:mainfrom
Kobzol:bors-squash

Conversation

@Kobzol
Copy link
Member

@Kobzol Kobzol commented Feb 28, 2026

It is probably the easiest way of squashing.

@rustbot
Copy link
Collaborator

rustbot commented Feb 28, 2026

Thanks for the PR. If you have write access, feel free to merge this PR if it does not need reviews. You can request a review using r? rustc-dev-guide or r? <username>.

@rustbot rustbot added the S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content label Feb 28, 2026
@Kobzol Kobzol requested a review from jieyouxu February 28, 2026 19:50
@BoxyUwU
Copy link
Member

BoxyUwU commented Feb 28, 2026

does bors squash have a way of setting the commit description?

@Kobzol
Copy link
Member Author

Kobzol commented Feb 28, 2026

By description, do you mean multi-line commit messages? Otherwise, this PR states how to override the commit message 😅

@tshepang
Copy link
Member

@Kobzol you probably missed Kobzol@e334fa0

@Kobzol
Copy link
Member Author

Kobzol commented Feb 28, 2026

Lol, I did indeed. I think that we should mention it at the top of the section though, otherwise people will just start with the local operations (case in point, I didn't notice the @bors squash documentation is already in the same section that I modified :) ), which is the more annoying option and can more likely lead to git issues. WDYT?

@BoxyUwU
Copy link
Member

BoxyUwU commented Feb 28, 2026

By description, do you mean multi-line commit messages?

oh is that all a description in a commit message is? 😆 I guess so :) Specifically I was thinking of this commit I approved today which has all the extra junk in addition to the main commit message:
rust-lang/rust@efc150e

It sounds like just setting the commit message will replace everything with the one thing you specify?

@Kobzol
Copy link
Member Author

Kobzol commented Feb 28, 2026

Yeah.

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kobzol
Copy link
Member Author

Kobzol commented Mar 1, 2026

I combined my new paragraph and the previous paragraph, and kept the new text at the top. Thanks for letting me know!

@Kobzol Kobzol enabled auto-merge March 1, 2026 08:16
@Kobzol Kobzol merged commit 34153d5 into rust-lang:main Mar 1, 2026
1 check passed
@rustbot rustbot removed the S-waiting-on-review Status: this PR is waiting for a reviewer to verify its content label Mar 1, 2026
@Kobzol Kobzol deleted the bors-squash branch March 1, 2026 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants