Skip to content

git: Make git::Commit do an amend when amending is pending - #54472

Merged
cole-miller merged 3 commits into
mainfrom
amend-on-commit
May 7, 2026
Merged

git: Make git::Commit do an amend when amending is pending#54472
cole-miller merged 3 commits into
mainfrom
amend-on-commit

Conversation

@cole-miller

Copy link
Copy Markdown
Member

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX checklist
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Release Notes:

  • The git::Commit action (cmd-enter or ctrl-enter) will now commit a pending amend.

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Apr 22, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label Apr 22, 2026
@maxdeviant maxdeviant changed the title git: make git::Commit do an amend when amending is pending git: Make git::Commit do an amend when amending is pending Apr 22, 2026
@cole-miller
cole-miller marked this pull request as ready for review April 22, 2026 15:53
@cole-miller
cole-miller enabled auto-merge May 7, 2026 17:17
@cole-miller
cole-miller added this pull request to the merge queue May 7, 2026
Merged via the queue into main with commit 10afe2f May 7, 2026
31 checks passed
@cole-miller
cole-miller deleted the amend-on-commit branch May 7, 2026 17:29
@kylekz kylekz mentioned this pull request May 8, 2026
3 tasks
jonx pushed a commit to jonx/zed-aros that referenced this pull request Jul 17, 2026
…ustries#54472)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- The `git::Commit` action (cmd-enter or ctrl-enter) will now commit a
pending amend.
jolutz pushed a commit to jolutz/zed that referenced this pull request Aug 8, 2026
…ustries#54472)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [ ] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- The `git::Commit` action (cmd-enter or ctrl-enter) will now commit a
pending amend.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants