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

Add commit fixup and rebase with autosquash #573

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

bkmeneguello
Copy link

Issue Number / Link:

closes #410

Summary of the issue:

Adds an option to create a fixup commit and also adds an option to autosquash interactive rebasing.

@bkmeneguello bkmeneguello requested a review from mhutchie as a code owner October 3, 2021 01:56
@bkmeneguello
Copy link
Author

Hi @mhutchie, any chance you check this? I use this feature daily basis and would be awesome to have it in vscode. Also, I have more like this to add if I could get it approved.

@Ghostbird
Copy link

Ghostbird commented May 11, 2023

@mhutchie I'd love to see this merged, do you have time to have a look at this?
@bkmeneguello I see some issues with this PR (keep in mind, I've no power here, I'm just a user who'd like this feature)

  1. You have enabled vigilant mode but have not signed this commit.
  2. It is actually two separate features in one
    • Control over the autosquash flag on rebase.
    • A fixup commit context menu option.
  3. I think the autosquash doesn't account for git config

Personally I don't care for the autosquash option, and I don't see it load the initial value from git config, nor override it. I think the actual logic executed may differ significantly from what the user selects. I don't know many use cases for not autosquashing, I always enable it by default system-wide. I've performed thousands of rebases and hundreds of fixups in the last few years, and I don't remember ever having to clear the fixup set by default autosquash.

The fixup context menu entry really adds something significant though. It's the one command that I regularly use that I have to run from the terminal.

In conclusion, I'd suggest splitting the features of this PR across two separate ones. Because the fixup option in my opinion is more desirable, and easier to merge.

@ShuXiao2023
Copy link

This is really a great feature, and I hope this can be merge too~~

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.

Commit context menu items to create fixup, squash and another for autosquash
4 participants