Using Git Worktree Instead of Git Stash

If you've ever had to switch tasks in the middle of your work, you've likely used git stash to temporarily save your changes. While git stash is a handy tool, it has some downsides—especially when juggling multiple tasks at once. Instead of stashing and unstashing, there's a better approach: git worktree.

Why Use Git Worktree?

The git worktree command allows you to check out a branch into a separate directory, keeping your current working directory untouched. This is especially useful when:

• You need to switch branches but have uncommitted changes.
• You’re working on multiple tasks at the same time.
• You want a clean environment for a different branch without stashing or committing.

With git worktree, you can have multiple working directories linked to the same repository. This avoids the hassle of stashing changes, switching branches, and then unstashing later.

How to Use Git Worktree

1. Add a New Worktree

Instead of stashing your work, create a new worktree:

1git worktree add -b new-branch ../new-branch-dir

This command:

• Creates a new directory (../new-branch-dir).
• Checks out new-branch in that directory.
• Leaves your current working directory unchanged.

If the branch doesn’t exist yet, you can create it on the fly:

2. Work in the New Directory

Navigate to the newly created directory:

1cd ../new-branch-dir

Now you can work in this directory as if it were a separate repository, while your original directory remains untouched.

3. Remove a Worktree When Done

First you might want to list your workspaces:

1git workspace list
2
3#results:
4/Users/you/some-repo/  83c21e6 [main]
5/Users/you/new-branch-dir 83c21e6 [new-branch]

Once you're finished with the additional worktree, remove it with:

1git workspace remove new-branch

If needed, you can also prune stale references:

1git worktree prune

Benefits Over Git Stash

When to Use Git Worktree

• When you need to switch branches quickly without committing or stashing changes.
• When working on multiple features at the same time without cluttering your workspace.
• When reviewing or testing a different branch without affecting your current work.
• When contributing to multiple repositories and want a separate checkout.

Conclusion

If you're still using git stash every time you switch tasks, give git worktree a try. It simplifies working with multiple branches and helps keep your workspace organized. No more juggling stashes—just a cleaner, more efficient workflow.