From 0d4c641e890f07307661478fe311b0b12a2c7cbd Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Sat, 16 Jan 2010 12:04:15 -0800 Subject: [PATCH] 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. --- Documentation/contributor/release-work.itexi | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi index 144b863d5d..209b877c2f 100644 --- 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 -- 2.39.5