vscode-gitlens icon indicating copy to clipboard operation
vscode-gitlens copied to clipboard

Added support for fixup commit

Open liadmord opened this issue 2 years ago • 4 comments


#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

  • [x] I have followed the guidelines in the Contributing document
  • [x] My changes follow the coding style of this project
  • [x] My changes build without any errors or warnings
  • [x] My changes have been formatted and linted
  • [ ] My changes include any required corresponding changes to the documentation
  • [x] My changes have been rebased and squashed to the minimal number (typically 1) of relevant commits
  • [x] 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

liadmord avatar Jan 15 '22 18:01 liadmord

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.

lgarron avatar Feb 10 '22 23:02 lgarron

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 avatar Feb 11 '22 21:02 liadmord

Waiting for the maintainers response before rebasing..

liadmord avatar Apr 08 '22 13:04 liadmord

@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. :)

liadmord avatar May 09 '22 14:05 liadmord

I can't wait for this feature!!

ShuXiao2023 avatar Sep 29 '23 06:09 ShuXiao2023

i am waiting your response

SumitKumargiri avatar Oct 29 '23 16:10 SumitKumargiri