Git Stash Cheatsheet

git_stash_cheatsheet.md

Git Stash Quick Tips

1. Stashing Changes

To stash your current changes (both staged and unstaged), use:

git stash

Or to include untracked files as well:

git stash -u

To give your stash a description for easier identification later:

git stash save "your description here"

2. Listing Stashed Changes

To view all stashed changes, use:

git stash list

Each stash will be listed in the form:

stash@{index}: description

Where index is the stash's position in the list.

3. Viewing Details of a Stash

To view the changes in a specific stash:

git stash show stash@{index}

To view the full diff of a specific stash:

git stash show -p stash@{index}

4. Applying Stashed Changes

To apply the latest stash to your working directory:

git stash apply

To apply a specific stash:

git stash apply stash@{index}

5. Dropping a Stash

After applying a stash, it remains in the list until manually dropped. To drop the latest stash:

git stash drop

To drop a specific stash:

git stash drop stash@{index}

To clear all stashes:

git stash clear

6. Popping a Stash (Apply and Drop)

To apply a stash and then immediately remove it from the stash list:

git stash pop

To pop a specific stash:

git stash pop stash@{index}

7. Recovering a Dropped Stash

If you accidentally dropped a stash and want to recover it, you can try:

git fsck --lost-found

Look for the commit SHA of the dropped stash, then create a new branch from that commit:

git checkout -b recovered-branch <commit-sha>

8. Creating a Branch from a Stash

To create a new branch from a specific stash:

git stash branch new-branch-name stash@{index}

9. Stashing Only Unstaged or Staged Changes

To stash only the unstaged changes, without touching the staged ones:

git stash --keep-index

To stash only staged changes (not unstaged or untracked files):

git stash --patch

---

Keep these commands handy to effectively manage and recover stashed changes in Git.