zed/crates/git/src
Cole Miller 5daadc0d30
git: Add CHERRY_PICK_HEAD to the list of merge heads (#26145)
Attempt to fix an issue where conflicts from a cherry-pick don't get
cleared out of the git panel after being resolved.

Release Notes:

- Git Beta: Fixed resolution of conflicts from cherry-picks not being
reflected in the git panel
2025-03-05 22:31:45 +00:00
..
blame.rs Rust 1.85 (#25272) 2025-02-28 18:33:35 +01:00
commit.rs windows: Set CREATE_NO_WINDOW for commands (#18447) 2024-11-20 16:52:38 -08:00
git.rs git: Fix project diff shortcuts (#26045) 2025-03-04 10:32:20 -07:00
hosting_provider.rs Add an undo button to the git panel (#24593) 2025-02-12 15:57:08 -07:00
remote.rs Detect wider variety of usernames for SSH-based remotes (#21508) 2024-12-05 15:23:37 -08:00
repository.rs git: Add CHERRY_PICK_HEAD to the list of merge heads (#26145) 2025-03-05 22:31:45 +00:00
status.rs Split conflicts into their own section (#24324) 2025-02-05 18:34:14 -07:00