On Mon, May 16, 2011 at 23:35, 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? Usually I'll: * Just make the commit on that topic branch (which is diverged from master) * Switch to master * Cherry-pick the sha1 * Push that upstream * Rebase the topic branch on master
