From eb7136185a852d5769d64af3585115632b41517c Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Tue, 20 Mar 2012 13:37:21 +0000 Subject: [PATCH] README-release: simplify slightly * top/README-release: Run "git checkout master" only once. --- ChangeLog | 5 +++++ top/README-release | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03e424f1f..748f09837 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-03-20 Reuben Thomas + + README-release: simplify slightly + * top/README-release: Run "git checkout master" only once. + 2012-03-15 Mark Wielaard git-merge-changelog: add specific example on how to use with hg. diff --git a/top/README-release b/top/README-release index 680547bd5..29ba2606b 100644 --- a/top/README-release +++ b/top/README-release @@ -1,6 +1,6 @@ Here are most of the steps we (maintainers) follow when making a release. -* Start from a clean, up-to-date git directory: +* Start from a clean, up-to-date git directory on "master": make -k maintainer-clean || { ./configure && make maintainer-clean; } git checkout master @@ -10,10 +10,10 @@ Here are most of the steps we (maintainers) follow when making a release. are in your PATH. See the buildreq list in bootstrap.conf for the complete list of tools. -* Ensure that you're on "master" with no uncommitted diffs. - This should produce no output: +* Ensure that you have no uncommitted diffs. This should produce no + output: - git checkout master; git diff + git diff * Ensure that you've pushed all changes that belong in the release: -- 2.11.0