summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorYoni Rabkin <yoni@rabkins.net>2021-03-05 14:29:27 -0500
committerYoni Rabkin <yoni@rabkins.net>2021-03-05 14:29:27 -0500
commitc81f084d660848d5bf06a108e45815c5ae96727a (patch)
tree92e2cfa8cb231ea8c07ffb2c17978a4bec8bb6cc /doc
parent45d179825b397d688ef5f4629547522567f46436 (diff)
parentcfc0a7c4a3a022256c8088521e9c577486a1a8ad (diff)
Merge branch 'master' into externals/rt-liberation
Diffstat (limited to 'doc')
-rw-r--r--doc/developer-release.txt13
1 files changed, 9 insertions, 4 deletions
diff --git a/doc/developer-release.txt b/doc/developer-release.txt
index ee5945d..8dd9677 100644
--- a/doc/developer-release.txt
+++ b/doc/developer-release.txt
@@ -30,11 +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
-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.