From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 27 Aug 2024 12:50:14 +0000 (+0300)
Subject: ; * admin/make-tarball.txt: Document gotcha.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8b16aa418ee491f76a814b99d8f7101a8d545e5;p=emacs.git

; * admin/make-tarball.txt: Document gotcha.

(cherry picked from commit d6880bc24ddf25c4bb814d80534ae66949142162)
---

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,