From cc4ec2d29ac4f3b8335d1851627a9735b81beb50 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 7 Oct 2019 09:44:17 +0200 Subject: [PATCH] Fix incorrect use of term HEAD for Git HEAD as used here was CVS terminology. Now we mean master. --- src/tools/RELEASE_CHANGES | 6 +++--- src/tools/git_changelog | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES index 920c6e9131d..46139877ed4 100644 --- a/src/tools/RELEASE_CHANGES +++ b/src/tools/RELEASE_CHANGES @@ -31,9 +31,9 @@ For Major Releases (in addition to the above) Note that once the release branch has been forked off in git, -release-note editing happens in that branch, not in HEAD. +release-note editing happens in that branch, not in master. Updates to the rest of the documentation usually need to happen -in both HEAD and the branch. +in both master and the branch. * Release notes o use src/tools/git_changelog @@ -120,7 +120,7 @@ Creating Back-Branch Release Notes diff commit-N.N.log commit-O.O.log | grep '^>' -* On the most recent release branch (*not* in HEAD), edit and create SGML +* On the most recent release branch (*not* in master), edit and create SGML markup for relevant changes in that branch's release-NN.sgml file. Minor release notes should include more small change details because testing is limited. diff --git a/src/tools/git_changelog b/src/tools/git_changelog index aaf9b7c1954..0720a58445e 100755 --- a/src/tools/git_changelog +++ b/src/tools/git_changelog @@ -39,7 +39,7 @@ # shows the last commit before that branch was made. # # Note that --master-only is an imperfect filter, since it will not detect -# cases where a HEAD patch was back-patched awhile later or with a slightly +# cases where a master patch was back-patched awhile later or with a slightly # different commit message. To find such cases, it's a good idea to look # through the output of # git_changelog --non-master-only --oldest-first --since='start-date' -- 2.39.5