diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-10-25 22:34:43 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-10-25 22:34:43 -0400 |
| commit | 19768ef94b4dea4e05296e0fd931316565a7ebf1 (patch) | |
| tree | 30058535ff33e05a15d46f7cbd86934014091f28 /README | |
| parent | 85ec7f2310e7624b67501f99c56f8bbeaf38e11f (diff) | |
* README: Sync with admin/README
Diffstat (limited to 'README')
| -rw-r--r-- | README | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -206,6 +206,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 |