Skip to content
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

Allow to toggle git hunk diffs #11080

Merged
merged 58 commits into from May 1, 2024
Merged

Allow to toggle git hunk diffs #11080

merged 58 commits into from May 1, 2024

Conversation

SomeoneToIgnore
Copy link
Contributor

@SomeoneToIgnore SomeoneToIgnore commented Apr 26, 2024

Part of #4523

Added two new actions with the default keybindings

"cmd-'": "editor::ToggleHunkDiff",
"cmd-\"": "editor::ExpandAllHunkDiffs",

that allow to browse git hunk diffs in Zed:

Untitled.mov

The hunks are dynamic and alter on user folds and modifications, or toggle hidden, if the modifications were not adjacent to the expanded hunk.

Release Notes:

  • Added editor::ToggleHunkDiff (cmd-') and editor::ExpandAllHunkDiffs (cmd-") actions to browse git hunk diffs in Zed

@SomeoneToIgnore SomeoneToIgnore self-assigned this Apr 26, 2024
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Apr 29, 2024
@SomeoneToIgnore SomeoneToIgnore force-pushed the kb/gutter-diff-hunks branch 7 times, most recently from 13971be to daad9ff Compare April 30, 2024 23:16
@SomeoneToIgnore SomeoneToIgnore marked this pull request as ready for review April 30, 2024 23:17
@SomeoneToIgnore SomeoneToIgnore merged commit caa0d35 into main May 1, 2024
8 checks passed
@SomeoneToIgnore SomeoneToIgnore deleted the kb/gutter-diff-hunks branch May 1, 2024 19:47
luckydye pushed a commit to luckydye/zed that referenced this pull request May 2, 2024
Part of zed-industries#4523

Added two new actions with the default keybindings

```
"cmd-'": "editor::ToggleHunkDiff",
"cmd-\"": "editor::ExpandAllHunkDiffs",
```

that allow to browse git hunk diffs in Zed:


https://github.com/zed-industries/zed/assets/2690773/9a8a7d10-ed06-4960-b4ee-fe28fc5c4768


The hunks are dynamic and alter on user folds and modifications, or
toggle hidden, if the modifications were not adjacent to the expanded
hunk.


Release Notes:

- Added `editor::ToggleHunkDiff` (`cmd-'`) and
`editor::ExpandAllHunkDiffs` (`cmd-"`) actions to browse git hunk diffs
in Zed
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant