Stashes

You can use Stashes to view all stashed changes in your repository.

Navigate Stashes

To open Stashes, click Git > Stashes.

Stashes are listed chronologically and display the following information.

• Stash ID: The most recent stash is assigned the stash@{0} ID.
• Stash name: The name of a stash is WIP by default.
• Timestamp: The amount of time since the stash was created.
• Files: The number of files in the stash.
• Branch name: The branch where the stash was created.

Stashes also shows whether a stash includes untracked files.

Click the Toggle compact mode icon to reduce the information provided for the stash.

To open a stash in a separate tab, right-click the stash and click Open in New Tab.

Create a stash

To create a stash, complete the following steps.

1. In Stashes, click Push Stash.
2. In the Push Stash dialog, enter a stash message in the Message field.
3. Click Stash to create a stash with your current changes.

You can change the scope of the stash in Advanced options.

Stash selected files

When you open Push Stash from Stashes, all selectable files in the current scope are selected. To select fewer files:

1. Click View files.
2. Clear the checkboxes for files you do not want to stash. Keep at least one file selected.
3. Click Stash Selected Files.

Changes in unselected files stay in your working tree and index. A staged rename and a file with both staged and unstaged changes each count as one file. Submodules cannot be selected. Open a submodule to stash changes inside it.

To stash one file, open Staging. Right-click the file. Click Stash This File….

Scope options

• Staged Files Only stashes only staged changes. Unstaged changes, untracked files, and ignored files stay unchanged. If staged and unstaged changes overlap in a selected file, Zide does not create the stash.
• Keep staged changes in place keeps the selected files’ staged changes in the index and working tree after the stash is created. This option is unavailable with Staged Files Only.

Zide needs the Git command-line tool for Staged Files Only and for stashes limited to specific files.

Stash view

Click a stash row to open the stash in Stash view. The Stash view displays the following information.

• Stash ID: The most recent stash is assigned the stash@{0} ID.
• Timestamp: When the stash was created.
• Branch: The branch where the stash was created.
• Files changed: Which files were changed in the stash.

Click a file row in the Files Changed section to view the changes made to the file. Click the filepath to open the file in the File view. Click the Open in Diffs icon to open all changed files in the Diff view.

Stash actions

In the Stash view, click the following action icons to perform a stash action.

Icon	Action
Pop	Applies the changes in the stash, then deletes the stash. The stash is deleted only after the changes apply cleanly.
Apply	Applies the changes in the stash and keeps the stash.
Create branch from this stash	Creates a new branch and applies the stashed changes.
Drop Stash	Deletes the stash.

Pop and Apply restore your file contents. They do not restore which changes were staged, matching git stash pop and git stash apply.

Each action applies to the stash you opened. If that stash is removed or its position in the list changes before the action starts, Zide stops the action. See The repository changed before an action could start.

Resolve stash conflicts

Applying a stash can conflict when the files it touches have changed since you created it. For example, you stash your work, pull new commits, and then pop the stash.

When this happens, Zide displays a Conflicts detected banner listing how many files need resolving. Click Open Staging to open Staging for that repository, where the unresolved files appear.

A conflicting Pop keeps the stash. Your stashed work remains recoverable until the changes apply cleanly.