Docs: CG: simplify instructions for working with release/unstable.

`git-merge' will merge all of the changes from the tip of
origin/release/unstable; there is no need to cherry-pick.

This also merges the release tag, which is a nice guidepost when viewing
git history.

diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi
index 144b863d5d953a1afb1bf2c8b4bbad47b97c9948..209b877c2feb65396c79ebef28e251a532b05c72 100644 (file)
--- a/Documentation/contributor/release-work.itexi
+++ b/Documentation/contributor/release-work.itexi
@@ -345,11 +345,7 @@ after 2.13.11; I need a chance to test these instructions)
 
 6. switch back to master and get the updated news:
   git checkout master
-  git cherry-pick release/unstable
-
-NOTE: this only works on the last change to release/unstable; if
-you had to hack more things to get the release working, then
-you'll need to put the hash directly in there
+  git merge origin/release/unstable
 
 7. update VERSION, commit, push.
   VERSION = what you just did +0.0.1