diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-10-25 22:25:23 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-10-25 22:25:23 -0400 |
| commit | 2250e2e4eace6b96bc922509ecca97e4d436474f (patch) | |
| tree | 60095bccbe98b5be584f7b160cc5b1777127fae7 /README | |
| parent | 771de7d2500d197055703582c945348957c515dd (diff) | |
(elpaa--get-release-revision): Tweak heuristic for `:merge`
* elpa-admin.el (elpaa--get-release-revision): Use `--first-parent`
for packages sync'd with `:merge`.
(elpaa--call): Skip nil args.
(elpaa--push): Simplify accordingly.
Diffstat (limited to 'README')
| -rw-r--r-- | README | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -174,6 +174,11 @@ merges instead of fast-forwards. This only works for the main branch, not for the release branch. An unnecessary =:merge= setting is considered as an error. +This option has many shortcomings, so its use is discouraged: it is +better avoided as much as possible. Among other problems, merges +don't interact well with the algorithm used to determine which +revision is a "release". + * Configuration (elpa-config) The configuration file is a `lisp-data-mode` file containing |