From 6e16bf2daa1057509b258e0f893cb437f24fffd7 Mon Sep 17 00:00:00 2001 From: Yoni Rabkin Date: Wed, 17 Feb 2021 12:47:26 -0500 Subject: * doc/developer-release.txt: --- doc/developer-release.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/developer-release.txt b/doc/developer-release.txt index ee5945d..3d5029e 100644 --- a/doc/developer-release.txt +++ b/doc/developer-release.txt @@ -35,6 +35,7 @@ the VCS: $ git push --tags origin "2.00" * ELPA -Push the changes to externals/rt-liberation on elpa.git with: +Merge the changes into the local externals/rt-liberation and then push +the changes to externals/rt-liberation on elpa.git with: $ git push elpa elpa:refs/heads/externals/rt-liberation -- cgit v1.2.3 From 78b9cfbb3bdde5c589904e987304f8726c841992 Mon Sep 17 00:00:00 2001 From: Yoni Rabkin Date: Wed, 17 Feb 2021 12:55:59 -0500 Subject: * doc/developer-release.txt: --- doc/developer-release.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/developer-release.txt b/doc/developer-release.txt index 3d5029e..8dd9677 100644 --- a/doc/developer-release.txt +++ b/doc/developer-release.txt @@ -30,12 +30,16 @@ Push these updates to the git repo. Tag the release with the ELPA version number, then push that tag to the VCS: - $ git tag -a 2.00 -m "2.00" + $ git tag -a 2.2 -m "2.2" - $ git push --tags origin "2.00" + $ git push --tags origin "2.2" * ELPA -Merge the changes into the local externals/rt-liberation and then push -the changes to externals/rt-liberation on elpa.git with: +Merge the changes into the local externals/rt-liberation (git will +complain) and then push the changes to externals/rt-liberation on +elpa.git with: - $ git push elpa elpa:refs/heads/externals/rt-liberation + $ git push + +...as long as externals/rt-liberation has the right remote and merge +setup. -- cgit v1.2.3