Sort git panel by staged/unstaged file versions and view diffs on both (how VSCode works)

[secondl1ght]

Hello,

I have a feature request to be able to configure Zed to match the functionality of VSCode's git panel.

1. Sort by staged/unstaged
2. View the diffs for both staged/unstaged files

Here is a screenshot from VSCode:

• When you click on the unstaged file it displays the diff between that file version and the staged version (if there is one in staging)
• When you click on the staged file it displays the diff between that file version and the latest commit
• When you stage the file it updates the previously staged version
• When you unstage the file it also keeps your latest changes

Hopefully my explanation makes sense but please let me know if you need clarification, a lot of people use the VSCode git panel so I think you'll know the behaviors I am speaking about. The new git panel in Zed is great, but I still can't make the editor switch until there is feature parity with VSCode's git panel for this feature. It makes it so that you can incrementally stage changes as you work on them, and view progress diffs until you are ready to do a commit, instead of only being able to view the diff between all your uncommitted changes and the last commit.

Thanks

[alvvaro]

Adding to the first part, I find that the way GitHub Desktop shows the changes list –using a single, combined list– is the most simple and less noisy way to do it. Entries do not jump when staging/unstaging, and changes in the same folder are shown together because of the alphabetical ordering.

Do you think it would be worth it to add some settings to personalize the way the list is organized? Or should Zed be opinionated about this?

For instance:

interface GitPanelSettings {
    group_changes_by: "tracked_status" | "staged_status" | "none";
}

[secondl1ght]

Related issue: #26560