Skip to content

Support blaming parent revisions - #62614

Merged
SomeoneToIgnore merged 2 commits into
mainfrom
kb/blame-blame
Aug 14, 2026
Merged

Support blaming parent revisions#62614
SomeoneToIgnore merged 2 commits into
mainfrom
kb/blame-blame

Conversation

@SomeoneToIgnore

Copy link
Copy Markdown
Contributor

Closes #42583

Adds more tooltip entries and editor::BlameRevision, editor::BlamePreviousRevision actions to use.
Started to highlight gutter blame entries that belong to currently annotated commit.

blame-blame.mov

Release Notes:

  • Supported blaming parent revisions

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Aug 14, 2026
@zed-community-bot zed-community-bot Bot added the staff Pull requests authored by a current member of Zed staff label Aug 14, 2026
@JosephTLyons

Copy link
Copy Markdown
Collaborator

Huge!

@SomeoneToIgnore
SomeoneToIgnore added this pull request to the merge queue Aug 14, 2026
Merged via the queue into main with commit f0685e0 Aug 14, 2026
36 checks passed
@SomeoneToIgnore
SomeoneToIgnore deleted the kb/blame-blame branch August 14, 2026 20:32
pull Bot pushed a commit to gaetschwartz/zed that referenced this pull request Aug 23, 2026
…3111)

Follow-up to zed-industries#62614

<img width="1728" height="1084" alt="bad"
src="https://github.com/user-attachments/assets/5fafb9cb-38be-44ba-b8a3-a33dc10106da"
/>

Properly disable actions instead of showing odd toasts and do nothing
when invoked without the prerequisites.

Release Notes:

- N/A
occamist pushed a commit to occamist/zed that referenced this pull request Aug 24, 2026
…3111)

Follow-up to zed-industries#62614

<img width="1728" height="1084" alt="bad"
src="https://github.com/user-attachments/assets/5fafb9cb-38be-44ba-b8a3-a33dc10106da"
/>

Properly disable actions instead of showing odd toasts and do nothing
when invoked without the prerequisites.

Release Notes:

- N/A

add sync_fork.yaml
playdohface pushed a commit to playdohface/zed that referenced this pull request Aug 29, 2026
Closes zed-industries#42583

Adds more tooltip entries and `editor::BlameRevision`,
`editor::BlamePreviousRevision` actions to use.
Started to highlight gutter blame entries that belong to currently
annotated commit.


https://github.com/user-attachments/assets/ba754e0b-6431-407c-8d79-2f8b0324fde1


Release Notes:

- Supported blaming parent revisions
playdohface pushed a commit to playdohface/zed that referenced this pull request Aug 29, 2026
…3111)

Follow-up to zed-industries#62614

<img width="1728" height="1084" alt="bad"
src="https://github.com/user-attachments/assets/5fafb9cb-38be-44ba-b8a3-a33dc10106da"
/>

Properly disable actions instead of showing odd toasts and do nothing
when invoked without the prerequisites.

Release Notes:

- N/A
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.

3 participants