On Wed, Jul 31, 2013 at 10:33:51AM +0530, Prasanna Santhanam wrote: > On Tue, Jul 30, 2013 at 10:03:08PM +0000, Animesh Chaturvedi wrote: > > > > > > > -----Original Message----- > > > From: Alex Huang [mailto:alex.hu...@citrix.com] > > > Sent: Tuesday, July 30, 2013 2:06 PM > > > To: dev@cloudstack.apache.org > > > Subject: RE: [ACS42] Release Status Update: After Code Freeze Next Steps > > > > > > > The best type of commit for keeping things clean is a cherry-pick. > > > > Merging into the release branch is messy to track as the RM. > > > > > > > > > > That should be a rule for release branches after code freeze. > > > > > > --Alex > > [Animesh>] Thanks for clarifying, we will follow that for 4.2 > > Also can we do a git cherry-pick -x? It lists the original commit from > which the cherry was picked. Without it git branch --contains on a > commit id returns the wrong branch the commit was brought in from.
Ah... smart idea!
