Open Stack

Hi all,

Back in April, I created some wrapper scripts around git-cherry(1) and
git-notes(1), which can help when you have more than a trivial number
of commits to upstream or backport from one branch to another.  Since
then I've improved these tools, and also written a higher-level CLI
which should make the whole process pretty easy.

Last week I finally finished a blog post with all the details:

  http://blog.adamspiers.org/2013/09/19/easier-upstreaming-with-git/

in which I demonstrate how to use the tools via an artificial example
involving backporting some commits from Nova's master branch to its
stable/grizzly release branch.

These tools worked pretty well for me and my team on code outside
OpenStack, but no doubt some people will have ideas how to improve
them, or have different techniques for tackling the problem.  Either
way, I hope this is of interest, and I'd love to hear what people
think!

Cheers,
Adam