Repository navigation
fix: scoped pop to the current branch's stash - #73
Merged
Merged
Conversation
`pop` ran `git stash pop`, which takes the newest stash from any branch. Stashing on `feature-a`, then on `feature-b`, then running `pop` back on `feature-a` applied `feature-b`'s work. `pop` is now a function in `.functions.sh` (mac and VPS) that pops the newest stash made on the current branch. When there is none, it prints "No stash for master" (or whichever branch) and changes nothing. Use `git stash pop` to move a stash across branches. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
poprangit stash pop, which takes the newest stash from any branch. Stashing onfeature-a, then onfeature-b, then runningpopback onfeature-aappliedfeature-b's work.popis now a function in.functions.sh(mac and VPS) that pops the newest stash made on the current branch. When there is none, it prints "No stash for master" (or whichever branch) and changes nothing. Usegit stash popto move a stash across branches.Tested in zsh against both the mac and VPS files: the case above, untracked files, stashes saved with a message, newest-first among several,
featvsfeat-2, branch names with/and., detached HEAD, and outside a repo.🤖 Generated with Claude Code