diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-10-25 20:28:23 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-10-25 20:28:52 -0400 |
| commit | 771de7d2500d197055703582c945348957c515dd (patch) | |
| tree | 184a518c259bda5713e1287dd09462ad461d92b6 /README | |
| parent | c808f49011faac9ae083513727dd239e242b3c12 (diff) | |
elpa-admin.el: Add support for non-fast-forward syncs
* elpa-admin.el (elpaa--fetch): Don't stop at diversion when `:merge`
is specified. Signal an error in branch suspected of being redundant.
(elpaa--merge): New function.
(elpaa--push): Obey `:merge`.
Diffstat (limited to 'README')
| -rw-r--r-- | README | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -168,6 +168,12 @@ this ORIG-VERSION (or REMAPPED-VERSION if non-nil) to override the default heuristic which uses the last revision that modified the "Version:" header. +** =:merge BOOL= +If non-nil, this setting indicates that syncs from upstream should use automatic +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. + * Configuration (elpa-config) The configuration file is a `lisp-data-mode` file containing |