dsh-git-desk 0.20.0 → 0.22.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -36,11 +36,12 @@ The tab is not a global panel. It does not sit above the Workspace session list.
36
36
  - **Tooltips.** Every icon-only control shows a native tooltip with the same text as its accessible name, so the sync, layout, and staging icons read without guessing.
37
37
  - **Two comparisons.** Staged compares `HEAD` to `Staged` with one arrow per block. Unstaged compares `Staged` to `Local` with two arrows per block.
38
38
  - **Block actions.** Left arrow stages a local block. Right arrow in the unstaged diff reverts the block to the staged version after confirmation. Right arrow in the staged diff unstages the block.
39
- - **Commit.** Message, amend toggle, and commit button. The button is disabled until something is staged and no conflict remains.
39
+ - **Discard.** The trash control in the diff header restores the selected file to the last commit, or deletes it when it is untracked, after a confirmation. This cannot be undone.
40
+ - **Commit.** Message, amend toggle, skip hooks toggle, and commit button. The button is disabled until something is staged and no conflict remains. Skip hooks commits with `--no-verify` when a hook is broken.
40
41
  - **AI commit actions.** The sparkle button next to Commit offers two actions. **Write a commit message** reads the staged patch and fills the message field. **Create a branch and commit** generates the message, derives the branch name, and opens the branch dialog for confirmation. Both use the model selected in Settings and run only when you click them.
41
42
  - **Branches.** The header menu searches local and remote branches, switches local branches, and creates a branch from `HEAD` without a commit. Choosing a remote branch creates a local tracking branch. The commit box still offers **Branch** for create-and-commit.
42
43
  - **Branch and commit.** Creates a branch from the current `HEAD`, commits only the staged changes, and leaves Push as the next action.
43
- - **Sync.** Fetch, pull, and push appear once in the header. Ahead and behind counts appear on push and pull only when they are not zero.
44
+ - **Sync.** Fetch, pull, and push appear once in the header. Ahead and behind counts appear on push and pull only when they are not zero. Pull fast-forwards only. When local changes would be overwritten, pull stashes them, retries, and restores them with staged files still staged. A conflicting restore keeps the stash, switches to Changes, and shows a notice that stays until it is closed or another sync runs.
44
45
  - **History.** Lanes, refs, author, relative time, commit detail, file list, and a read-only full-file diff preview in the right panel matching JetBrains ergonomics.
45
46
  - **Commit actions.** Right-click a commit, or use the actions control in the detail header, to undo the last commit, revert it, cherry-pick it onto the current branch, or reset the branch to it. Undo and revert open Changes with the message filled and the changes staged. Undo is refused for a pushed HEAD, revert and cherry-pick are refused for merge commits, and every action is refused while another operation is in progress. The menu states the reason on the disabled row.
46
47
  - **Stashes.** File-level stash with a message, then apply, pop, or drop.
@@ -73,6 +74,7 @@ Details, endpoint table, and verification are in [`docs/implementation.md`](docs
73
74
 
74
75
  - The tab uses the current session's workspace path. A per-session `workingDirectory` override or a DSH worktree outside the workspace is not followed.
75
76
  - Stash is file-level. Hunk-level stash is not implemented.
77
+ - Discard has no undo. It is refused for a conflicted file, while another operation is in progress, and for a rename whose old path holds another file. An untracked nested repository is not deleted.
76
78
  - Commit messages and branch names are not generated by a model.
77
79
  - Conflict resolution is whole-side plus the marker view. There is no three-pane editor.
78
80
  - Block arrows are hidden on a rename; use the file buttons.