diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2024-08-27 15:50:14 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2024-08-27 15:50:14 +0300 |
| commit | d6880bc24ddf25c4bb814d80534ae66949142162 (patch) | |
| tree | 84144e11f8fd7e2f29b88e3eba115902bedb48e1 /admin | |
| parent | afee71273b7041377148fbcfb554db5b45bcb3c9 (diff) | |
; * admin/make-tarball.txt: Document gotcha.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/make-tarball.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 1b6d9744ecc..85a8ef2624d 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -210,7 +210,10 @@ General steps (for each step, check for possible errors): should be committed separately, as described in step 3 above, to avoid them being merged to master. The lisp/ldefs-boot.el file should not be merged to master either, so it could be added to the - same commit or committed separately. + same commit or committed separately. To make sure the changes to + ChangeLog.N and etc/AUTHORS are _not_ skipped, do NOT describe their + updates as "regenerate" or "re-generate", since gitmerge.el by + default skips such commits; instead, use "update" or some such. The easiest way of doing that is "C-x v d ROOT-DIR RET", then go to the first modified file, press 'M' to mark all modified files, |