Skip to content

Conversation

@stefanhaller
Copy link
Collaborator

  • PR Description

Allow resetting the author of the HEAD commit while in a rebase, and disallow resetting the author for any other commit during a rebase.

We somehow missed that in #2485.

  • Please check if the PR fulfills these requirements
  • Cheatsheets are up-to-date (run go run scripts/cheatsheet/main.go generate)
  • Code has been formatted (see here)
  • Tests have been added/updated (see here for the integration test guide)
  • Text is internationalised (see here)
  • Docs (specifically docs/Config.md) have been updated if necessary
  • You've read through your own file changes for silly mistakes etc

@stefanhaller
Copy link
Collaborator Author

This is a small one, and I verified that it doesn't conflict with the big refactor.

I didn't add any integration tests for this, let me know if you feel they are necessary.

@github-actions
Copy link
Contributor

github-actions bot commented Apr 18, 2023

Uffizzi Preview deployment-22642 was deleted.

@jesseduffield
Copy link
Owner

Looks good to me. Did you need to do any commit squashing or is this good to merge?

@stefanhaller
Copy link
Collaborator Author

This is good to merge from my side.

@jesseduffield jesseduffield merged commit aa70723 into jesseduffield:master Apr 29, 2023
@stefanhaller stefanhaller deleted the allow-resetting-author-during-rebase branch April 29, 2023 05:27
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.

2 participants