If you are *ever* cherry-picking something to an older stable branch, 
please use 

 git cherry-pick -x <sha1>

That will append a '(cherry-picked from ....)' message to the bottom of 
the commit, allowing us to always find the original commit that we are 
duplicating.

This implies that we are always committing to the master/next branch 
*first*, and then cherry-picking to stable.  As a general rule, a fix 
should always be 'upstream' first in the new branches before it is 
backported to something older.  The exception is fix that is unique to the 
stable branch, for example because the new code has changed.

Thanks!
sage

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to