branch: main
commit b45671d5acece9003313c1005c3796dd57dd01da
Author: Tassilo Horn <t...@gnu.org>
Commit: Tassilo Horn <t...@gnu.org>
Talk about elpa's main branch, not master
---
README | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README b/README
index 9e77d6c..fdf1027 100644
--- a/README
+++ b/README
@@ -214,11 +214,11 @@ correctly in the commit.
** External branches
A copy of the code of every package is kept in the =elpa.git= repository
-(not in the =master= branch) and if applicable should be sync'd with the
+(not in the =main= branch) and if applicable should be sync'd with the
upstream every once in a while. This copy may include local changes,
although these should be kept to a minimum.
-The copy of the code is not kept in =master= but in the
+The copy of the code is not kept in =main= but in the
=externals/<pkg-name>= branch in the =elpa.git= repository.
[ Note: The name "externals/" is the result of an accident of history. ]
@@ -247,7 +247,7 @@ Then edit the =elpa-packages= file as mentioned above, add
the line
("realgud-ipdb" :url "https://github.com/realgud/realgud-ipdb";)
#+end_src
-and push that change to the master branch of =elpa=. After it's added to
+and push that change to the =main= branch of =elpa=. After it's added to
the =elpa-packages= file, the package can be maintained just by
pushing changes to the =externals/<pkgname>= branch.
