summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorTassilo Horn <tsdh@gnu.org>2021-04-03 21:29:15 +0200
committerJonas Bernoulli <jonas@bernoul.li>2021-10-21 00:38:23 +0200
commit9ea2037676e4a3c825dc373554fc47b1d4828392 (patch)
tree242eeb923cca9e1bf30edc05b3bf6889e1d44e17 /README
parent3a4ba9969772a290df1cdf5d6abafd77fb691172 (diff)
Talk about elpa's main branch, not master
Diffstat (limited to 'README')
-rw-r--r--README6
1 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index 8c71782..bf571f1 100644
--- a/README
+++ b/README
@@ -385,11 +385,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 default 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 the default branch but in the
+The copy of the code is not kept in the =main= branch but in the
=elpa/<pkg-name>= branch in the =elpa.git= repository.
To add a new package, first add this =elpa.git= repository as a
@@ -417,7 +417,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 default 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 =elpa/<pkgname>= branch.