Skip to content
This repository has been archived by the owner on May 7, 2024. It is now read-only.

Support --autosquash #20

Open
alexlarsson opened this issue Sep 26, 2019 · 10 comments · May be fixed by #24
Open

Support --autosquash #20

alexlarsson opened this issue Sep 26, 2019 · 10 comments · May be fixed by #24

Comments

@alexlarsson
Copy link

alexlarsson commented Sep 26, 2019 •
edited

It would be nice if git rebase --autosquash was supported so that one could use this action to rebase and get rid of fixup commits.

Also, if this is supported it might be nice to support both regular and autosquash rebases using the same actions, but with different commands. For this to work the /rebase regexp needs to be made configurable for the action.
@fkorotkov
Copy link
Member

fkorotkov commented Sep 26, 2019 •
edited

What do you think about an additional /squash-rebase command?

@alexlarsson
Copy link
Author

That would be fine for me.

@fkorotkov
Copy link
Member

Or maybe add some environment variables to customize Git arguments. 🤔

@alexlarsson
Copy link
Author

If so, you need to also allow the command name to be defined, so you can use multiple different types of rebase in the same repo.

@marton78
Copy link

This would be a great addition! If with an additional command such as /squash-rebase or any other syntax is not so important, I'd go with whatever is easiest to implement.

@fkorotkov
Copy link
Member

I think I'll add a feature so you can specify Git arguments after /rebase like /rebase --autosquash. Will work on this later this week, I'm at GitHub Universe at the moment. Will see if they'll announce something new today. 😅

@fkorotkov fkorotkov linked a pull request Nov 18, 2019 that will close this issue
Open
@fkorotkov
Copy link
Member

PTAL at #24

@samholmes
Copy link
Contributor

Why did #24 fail; what was the message? Also, can we reopen the PR to try to fix? I'm going to start testing to see if I can get it to work on my end.

@samholmes samholmes mentioned this issue Jul 1, 2021
Merged
@samholmes samholmes mentioned this issue May 9, 2022
Closed
@JanCVanB
Copy link

JanCVanB commented Jun 2, 2023

Is this fixed?

@samholmes
Copy link
Contributor

samholmes commented Jun 2, 2023 •
edited

@JanCVanB I believe --autosquash is implemented and merged by my PR #83

See the part of the README about enabling autosquash based on a predicate: 4ad1453

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Autosquash cirrus-actions/rebase
5 participants
@samholmes @fkorotkov @alexlarsson @marton78 @JanCVanB