Merge branch 'athena/unstable' into athena/bullseye-backports

2 files changed, 9 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 7d52e4bc806..5c706322f4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+emacs-snapshot (29.1~git20221203.1) unstable; urgency=medium
+
+  * Package git snapshot.
+  * d/merge-snapshot: don't hard code "origin/master" in merge messages.
+    We are presently merging from the emacs-29 branch.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Sun, 04 Dec 2022 17:38:14 -0700
+
 emacs-snapshot (29.1~git20221126.1~bpo11+1~athena1) bullseye-backports; urgency=medium
 
   * Rebuild for athena apt repository.
diff --git a/debian/merge-snapshot b/debian/merge-snapshot
index 207d441407d..83629af517c 100755
--- a/debian/merge-snapshot
+++ b/debian/merge-snapshot
@@ -34,8 +34,7 @@ for (<$fh>) {
 $major_version or die "couldn't extract devel major version number";
 
 $git->merge({
-        message =>
-          "Merge remote-tracking branch 'origin/master' into athena/unstable"
+        message => "Merge upstream Git snapshot into athena/unstable"
     },
     $to_merge
 );