Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature Request: Squash the last two commits and sync to remote #33

Closed
aphsa opened this issue Mar 18, 2023 · 2 comments · Fixed by #34
Closed

Feature Request: Squash the last two commits and sync to remote #33

aphsa opened this issue Mar 18, 2023 · 2 comments · Fixed by #34
Assignees
Labels
enhancement New feature or request

Comments

@aphsa
Copy link

aphsa commented Mar 18, 2023

Ability to squash the last n commits and sync that to the remote

@julien040 julien040 self-assigned this Mar 19, 2023
@julien040 julien040 added the enhancement New feature or request label Mar 19, 2023
@julien040
Copy link
Owner

Hello, thank you for the suggestion.

Regarding squashing and merging, if you are using GitHub, GitLab, or BitBucket, you can already do this with gut by running gut merge [branch]. This will open a pull request, allowing you to squash and merge your commits.

I am considering adding a feature to gut that would allow for only squashing, but this would only be possible over commits that have not been pushed yet. This is due to the fact that it would be against one of the principles of gut: no rewrite of the history.

The syntax for this could be gut squash [n], with n being the number of commits from HEAD you want to merge. Does this sound like something you would like?

@julien040 julien040 linked a pull request Mar 19, 2023 that will close this issue
@julien040
Copy link
Owner

Hey @aphsa,
I have just published a new version (0.2.5) that includes gut squash.
I hope it'll help you.

If you have any other feature request, don't hesitate

@julien040 julien040 reopened this Mar 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants