How to Use Git Stash Like a Pro

Git is an incredibly powerful version control tool and offers numerous commands that can make your development workflow smoother and more efficient. One ...

of these important, yet often underused, commands is "git stash." Whether you're refactoring code, making quick fixes, or working on complex tasks without any intermediate steps, mastering the "git stash" command can significantly increase your productivity. This blog post explains the different uses of "git stash" and helps you manage and edit branches more effectively.

---

1. Understanding Git Stash
2. Basic Usage of Git Stash
3. Applying Stashed Changes
4. Clearing Stashes
5. Saving with a Message
6. Stashing and Branching
7. Conflicts and Stashing
8. Using Stash with Pull Requests
9. Conclusion

---

1.) Understanding Git Stash

Before diving into specific usage scenarios, it's crucial to understand what `git stash` does. The `git stash` command temporarily saves changes made in your working directory (including new files added, modified or deleted) without committing them. These stashed changes are saved in a stack and can be reapplied later when needed. This is particularly useful for switching branches or making temporary fixes without polluting the current branch with unrelated changes.

---

2.) Basic Usage of Git Stash

The most straightforward use of `git stash` is to save your uncommitted changes:

git stash

This command will take all the changes you've made since your last commit and store them in a stack, leaving your working directory clean. You can list all stashes using:

git stash list

Each stash is given a unique identifier (e.g., -stash@{0}- -stash@{1}- which you can refer to when applying or removing specific stashes.

---

3.) Applying Stashed Changes

To reapply the most recent stash, use:

git stash apply

If you want to apply a specific stash (e.g., stash@{0}), you can specify it like this:

git stash apply stash@{0}

This will bring back your changes onto the current branch at the point where you stashed them.

---

4.) Clearing Stashes

If you need to clear a specific stash, you can use `git stash drop` followed by the stash identifier:

git stash drop stash@{0}

To remove all stashed changes, use:

git stash clear

---

5.) Saving with a Message

You can also save your changes with a meaningful message using:

git stash save -Your descriptive message here-

This makes it easier to track what each stash contains later.

---

6.) Stashing and Branching

A common workflow is to stash changes before switching branches, ensuring that you don't commit work in progress directly to a branch. After stashing, switch the branch:

git checkout other-branch
# Now your changes are safely stashed and not committed

After working on the other branch, you can reapply the stash:

git checkout original-branch
git stash apply stash@{0}

This technique is invaluable for maintaining clean branches without cluttering them with incomplete work.

---

7.) Conflicts and Stashing

Sometimes, when you apply a stash, there might be merge conflicts. Git will pause at each conflict and let you resolve it before proceeding. After resolving all conflicts, use:

git add .
git stash apply

Or to skip the resolution dialog (not recommended for large or complex changes):

git stash apply --index

This applies the stash as if there were no conflicts, but leaves unresolved conflicts in the working directory.

---

8.) Using Stash with Pull Requests

In a collaborative environment where branches are frequently pushed and pulled from remote repositories, stashing can help manage changes before merging:
1. Stash your changes locally:

git stash

2. Fetch and pull the latest changes from the remote repository:

git fetch origin
git pull origin main

3. Apply your stashed changes:

git stash apply

This ensures that you are working on a clean state and can merge without conflicts easily.

---

9.) Conclusion

`git stash` is an invaluable tool in your Git arsenal, providing a way to temporarily save and manage changes without committing them. By understanding its basic usage and exploring advanced scenarios like applying specific stashes or managing conflicts, you can leverage this command more effectively. Whether you're a solo developer looking to keep your main branch pristine or part of a team working across multiple branches, mastering `git stash` will enhance your workflow and productivity.

---

The Autor: PatchNotes / Li 2026-04-05