You can't cherry-pick a merge commit, but there's nothing stopping you from cherry-picking it's parent commit. But since neither of them has a proper commit message it's probably not a good idea. Especially since the reason the changes are in a stash in the first place is probably because they're not ready to be committed.
Your best bet is to use the stash as a stash and apply it to your working tree (a or A in the status buffer). P.S.: Yes, you *can* show stashes in the log buffer if you use the --all option. (l - a l l) On Mon, May 16, 2011 at 2:35 PM, Dave Abrahams <[email protected]> wrote: > > It's fairly common that I find myself on my own topic branch making a > change that I want to submit upstream. Therefore, I want to take the > changes in my working tree and re-apply them atop a different branch > (e.g. master). My natural inclination is to stash them, switch to the > other branch, and then hit `a' on the stash in my log view to apply the > changes where I am. Of course that doesn't work because for some reason > a stash is a merge commit and you can't cherry pick those (apparently > because such commits "have no content" in spite of the plainly-visible > diffs in my stash commit). Am I just going about this wrongly? > > TIA, > > -- > Dave Abrahams > BoostPro Computing > http://www.boostpro.com > >
