diff options
| author | Stephen Leake <stephen_leake@stephe-leake.org> | 2022-10-26 11:59:34 -0700 |
|---|---|---|
| committer | Stephen Leake <stephen_leake@stephe-leake.org> | 2022-10-26 11:59:34 -0700 |
| commit | f25deda3241b1886f176363577d32106fb9bb5ba (patch) | |
| tree | 15abf7e5bbd3f8a32c638928143ba0f39ed13cb5 /README | |
| parent | 882867798de13615bd4c858c072114a269cc63eb (diff) | |
| parent | ad54813b7a6b52ac8da929ffacef604981fb2db6 (diff) | |
Merge branch 'elpa-admin' of git.savannah.gnu.org:/srv/git/emacs/elpa into elpa-admin
Diffstat (limited to 'README')
| -rw-r--r-- | README | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -176,6 +176,17 @@ 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. + +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 |