On Mon, Feb 21, 2011 at 09:18:41PM +0000, Roddie Grant wrote: > "git stash list" produces > "stash@{0}: On bucketDisplay: site/css/site.css" > from which I infer that the only file in the stash is site/css/site.css. But > "git stash pop" lists merge conflicts with 5 other files. What's going on? git-stash stashes your entire work tree, not just one file. In fact, if you're curious, run `gitk --all` in repository which has a non-empty stash stack and see how git represents the stash.
-- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.