Visitar URL original
Show the diff between two arbitrary files · Issue #4523 · zed-industries/zed · GitHub
Skip to content

Show the diff between two arbitrary files #4523

Description

@hferreiro

Summary

Add support for showing the diff between different files, similarly to VSCode's code -d/--diff.

Activity

  1. dangh commented on Aug 23, 2023

    @dangh

    I would love it too. Zed is a great editor. Lately I've been using it as a terminal app (a window with just center terminal views) and it works fantastic too. A proper git support and I can have everything in one application.

  2. Spoutnik97 commented on Jan 29, 2024

    @Spoutnik97

    Hi!
    I found a great article to have a feature near to what you want : https://spin.atomicobject.com/fuzzy-find-git-add/

    TLDR: use fzf to list changed files and add them to the git HEAD

    Try the following command : git ls-files -m -o --exclude-standard | fzf -m --print0 | xargs -0 -o -t git add

  3. alioshr commented on Feb 26, 2024

    @alioshr

    Any progress or ETA to start working on this?

  4. savoygrizzly commented on Feb 28, 2024

    @savoygrizzly

    While adding a diff viewer, might be nice to add some sort of git quick ui actions somewhere, I love that in vscode I don't have to open up a terminal to push my changes to the remote.
    Also as many stated, new files and folder highlight would be nice.

  5. Moshyfawn commented on Feb 28, 2024

    @Moshyfawn
    Contributor

    While adding a diff viewer, might be nice to add some sort of git quick ui actions somewhere, I love that in vscode I don't have to open up a terminal to push my changes to the remote.

    There's a separate feature request for the source control panel #4367

    Also as many stated, new files and folder highlight would be nice.

    I believe the basic highlighting of committed vs new files and folders is already in the latest Zed build.

  6. savoygrizzly commented on Feb 28, 2024

    @savoygrizzly

    It doesnt seem to work with nested git (say I have a root docker composer with 2 folders for services each tracked independently), it will only track newly created files for the top level git.

    Nevertheless I just switched from vscode, love what you've been doing and even on a big machine you can feel the responsiveness difference. Awesome job guys !

  7. Moshyfawn commented on Feb 28, 2024

    @Moshyfawn
    Contributor

    It doesnt seem to work with nested git (say I have a root docker composer with 2 folders for services each tracked independently), it will only track newly created files for the top level git.

    I believe it's tracked in #8275.

    Nevertheless I just switched from vscode, love what you've been doing and even on a big machine you can feel the responsiveness difference. Awesome job guys !

    💜

  8. Chimpaya commented on Mar 1, 2024

    @Chimpaya

    Pumping this again. The only thing keeping me from switching is the lack of git diff UI, like in VSCode. Would love to have it.

  9. 35 remaining items

  10. added theissue type on Feb 26, 2025
  11. removed
    featureDEPRECATED label: use issue type 'Feature' instead
    on Feb 26, 2025
  12. maxbrunsfeld commented on Mar 12, 2025

    @maxbrunsfeld
    Collaborator

    Zed now has a project diff view! Open it with the git: Diff action or from the new git panel.

  13. changed the title [-]Add a diff view[/-] [+]Add support for showing the diff between two arbitrary files[/+] on Mar 14, 2025
  14. JosephTLyons commented on Mar 14, 2025

    @JosephTLyons
    Collaborator

    Reopened, as this issue is asking for the ability to diff any 2 arbitrary files, not just a diff between what is committed and what has changed.

  15. changed the title [-]Add support for showing the diff between two arbitrary files[/-] [+]Show the diff between two arbitrary files[/+] on Apr 4, 2025
  16. JosephTLyons commented on Jun 18, 2025

    @JosephTLyons
    Collaborator

    This is now available in stable.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions