diff options
| author | Tassilo Horn <tsdh@gnu.org> | 2021-04-03 21:29:15 +0200 |
|---|---|---|
| committer | Tassilo Horn <tsdh@gnu.org> | 2021-04-03 21:29:15 +0200 |
| commit | b45671d5acece9003313c1005c3796dd57dd01da (patch) | |
| tree | 1d000797ce485303df9b0f72cce661f24e93033a /README | |
| parent | 1b3d2566e3052907e9f4936eb6e6de50bd2e819c (diff) | |
Talk about elpa's main branch, not master
Diffstat (limited to 'README')
| -rw-r--r-- | README | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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. |
