git-stash

I often put work away for later, then other stuff comes along, and a few weeks later, I want to inspect the stash, and find out what changes it would make if I applied it to working tree in its current state. I know I can do a git diff on the stash, but this shows me all the differences between the working tree and the stash, whereas I'm just interested to know what the stash apply is going to change. How can I do this? Jlew git stash show will show you the files that changed in your most recent stash. You can add the -p option to show the diff. git stash show -p If the stash you are

A colleague has a stash in their repository which I can access (via the filesystem), and I'd like to pull that stash into a branch in my repository. % git ls-remote ~alice/work/repo/ stash 3ccc82fb1ee0e7bde1250c7926d333ce21c109c0 refs/stash But when I try to fetch that, git tells me "unable to find 3cc82..." % git fetch ~alice/work/repo stash:new_branch remote: Total 0 (delta 0), reused 0 (delta 0) error: unable to find 3ccc82fb1ee0e7bde1250c7926d333ce21c109c0 fatal: object 3ccc82fb1ee0e7bde1250c7926d333ce21c109c0 not found Is there a way I can fetch the remote stash? sehe Update : A direct

I had some uncommitted changes in my development branch and I stashed them using git stash , but there were some changes which were very important among those stashed ones. Is there any way to get back those changes? Also, I have made some changes on top of the stashed code files since. Is there any chance I can retrieve the stashed changes to a new branch if possible? torek The easy answer to the easy question is git stash apply Just check out the branch you want your changes on, and then git stash apply . Then use git diff to see the result. After you're all done with your changes—the apply

How can I see the changes un-stashing will make to the current working tree? I would like to know what changes will be made before applying them! Amber See the most recent stash: git stash show -p See an arbitrary stash: git stash show -p stash@{1} From the git stash manpages: By default, the command shows the diffstat, but it will accept any format known to git diff (e.g., git stash show -p stash@{1} to view the second most recent stash in patch form). czerasz To see the most recent stash: git stash show -p To see an arbitrary stash: git stash show -p stash@{1} Also, I use git diff to compare

I'd like to know if it is possible to extract a single file or diff of a file from a git stash without popping the stash changeset off. Might anyone be able to provide some suggestions/ideas about this? In git stash manpage you can read that (in "Discussion" section, just after "Options" description): A stash is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at HEAD when the stash was created. So you can treat stash (e.g. stash@{0} is first / topmost stash) as a merge commit, and use: $ git diff stash@{0}^1 stash@{0} --

Possible Duplicate: Is it possible to preview stash contents in git? I see here you can apply/unapply a stash and even create a new branch off of a stash. Is it possible to simply see what is inside the stash without actually applying it? simont From the man git-stash page: The modifications stashed away by this command can be listed with git stash list, inspected with git stash show show [<stash>] Show the changes recorded in the stash as a diff between the stashed state and its original parent. When no <stash> is given, shows the latest one. By default, the command shows the diffstat, but it

I was always under the impression that you could give a stash a name by doing git stash save stashname , which you could later on apply by doing git stash apply stashname . But it seems that in this case all that happens is that stashname will be used as the stash description. Is there no way to actually name a stash? If not, what would you recommend to achieve equivalent functionality? Essentially I have a small stash which I would periodically like to apply, but don't want to always have to hunt in git stash list what its actual stash number is. Sri Murthy Upadhyayula This is how you do it: