Skip to content

Added support for fixup commit #1770

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

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

Conversation

liadmord
Copy link

@liadmord liadmord commented Jan 15, 2022


#1031

Description

As part of a common workflow with git using rebases and fixup commits to make cleaner history during work with pull requests, creating fixup commits is a crucial part of the flow, so adding a button to do so easily through Gitlens makes the flow much more convenient.

The general implementation here is creating a new git command for commit and only expose it through providing a fixup flag with a reference on top of which the fixup commit will be created.

Checklist

  • I have followed the guidelines in the Contributing document
  • My changes follow the coding style of this project
  • My changes build without any errors or warnings
  • My changes have been formatted and linted
  • My changes include any required corresponding changes to the documentation
  • My changes have been rebased and squashed to the minimal number (typically 1) of relevant commits
  • My changes have a descriptive commit message with a short title, including a Fixes $XXX - or Closes #XXX - prefix to auto-close the issue that your PR addresses

@lgarron
Copy link

lgarron commented Feb 10, 2022

Thanks! This would help me a lot.

I'm keen to give the new UI a go, but I can't use it for daily work unless it supports f/fixup.

@liadmord
Copy link
Author

Thanks! This would help me a lot.

I'm keen to give the new UI a go, but I can't use it for daily work unless it supports f/fixup.

Hey @lgarron , thank you for responding here, the rebase editor ui already supports these options, what was added here is the ability to right click a commit in the commit list inside the git extension, and then create a fixup commit from that menu.

@liadmord
Copy link
Author

liadmord commented Apr 8, 2022

Waiting for the maintainers response before rebasing..

@liadmord
Copy link
Author

liadmord commented May 9, 2022

@eamodio
Hey, can you please comment here whether you think this is useful or not?
Also, if the general idea of the implementation is the right angle or not.
I'd like to know before I fix the conflicts. :)

@ShuXiao2023
Copy link

I can't wait for this feature!!

@SumitKumargiri
Copy link

i am waiting your response

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.

4 participants