summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2020-12-18 17:46:13 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2020-12-18 17:46:13 -0500
commitd47f83fc3a66ab03dc36b590622dea9b94c7cb2b (patch)
treee5775e62ef5caeb80078bbf9464c32de83f98b21 /README
parent0b8402335c316ac86c8ba429a342cfc78b4c9c69 (diff)
* elpa-admin.el (elpaa--fetch): Use the default branch rather than "master"
Diffstat (limited to 'README')
-rw-r--r--README8
1 files changed, 4 insertions, 4 deletions
diff --git a/README b/README
index cb295c5..3bb95b9 100644
--- a/README
+++ b/README
@@ -59,7 +59,7 @@ It can be a single file name or a list of file names.
** =:branch BRANCH=
Specifies the branch to follow in the upstream Git repository, in case
-it should be different from =master=.
+it should be different from the default branch.
** =:main-file FILE=
Gives the name of the main file of the package, i.e. the file in which
@@ -277,11 +277,11 @@ The instructions below are for those maintainers who prefer to use a dedicated
repository or branch for the package or for largish packages.
In any case, a copy of the code is kept in the =elpa.git= repository
-(not in the =master= branch) and should be sync'd with the
+(not in the default branch) and 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 the default branch but in the
=elpa/<pkg-name>= branch in the =elpa.git= repository.
To add a new external package, first add this =elpa.git= repository as a
@@ -309,7 +309,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 default branch of =elpa=. After it's added to
the =elpa-packages= file, the package can be maintained just by
pushing changes to the =elpa/<pkgname>= branch.