diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/merge-snapshot | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 73c6369e76d..134b3bb3329 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ emacs-snapshot (29.1~git20221203.1) UNRELEASED; 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:07:06 -0700 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 ); |