canmove, Confirmed users
2,056
edits
Jetpack/Release Process: Difference between revisions
Jump to navigation
Jump to search
update the command for listing changes between master and stabilization to a better one
(update the command for listing changes between master and stabilization to a better one) |
|||
| Line 241: | Line 241: | ||
Periodically generate a list of changes between the master and stabilization branches: | Periodically generate a list of changes between the master and stabilization branches: | ||
git rev-list -- | git rev-list --right-only --cherry-pick --no-merges --pretty --reverse stabilization...master | ||
{{Note|'''<tt>--right-only</tt> shows only commits on master (on the right in the symmetric diff notation <tt>stabilization...master</tt>) that are not on stabilization; <tt>--cherry-pick</tt> omits equivalent commits; <tt>--no-merges</tt> excludes merge commits (it's usually better to cherry-pick only non-merge commits); <tt>--pretty</tt> shows useful info about each commit; and <tt>--reverse</tt> shows commits chronologically from older to newer (the same order in which you are most likely to cherry-pick them successfully).}} | |||
Identify stabilizing changes landed on the master branch, and cherry-pick them to the stabilization branch: | Identify stabilizing changes landed on the master branch, and cherry-pick them to the stabilization branch: | ||