From: Eli Zaretskii <eliz@gnu.org>
To: Glenn Morris <rgm@gnu.org>
Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org
Subject: Re: make change-history on non-master branches
Date: Mon, 16 Nov 2015 18:02:55 +0200 [thread overview]
Message-ID: <831tbqc4pc.fsf@gnu.org> (raw)
In-Reply-To: <l3a8qg6m8y.fsf@fencepost.gnu.org>
> From: Glenn Morris <rgm@gnu.org>
> Date: Sat, 14 Nov 2015 21:15:57 -0500
> Cc: emacs-devel@gnu.org
>
> And the resulting ChangeLog.2 entries (and more importantly, any
> corrections) will have to be merged to master, just like in the old days?
Maybe I'm missing something, but why do we have to merge it? Won't
"make change-history" create on each branch the file that branch
wants?
If we can avoid merging, we could teach gitmerge.el skip that file.
next prev parent reply other threads:[~2015-11-16 16:02 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-15 2:15 make change-history on non-master branches Glenn Morris
2015-11-15 7:11 ` Paul Eggert
2015-11-16 16:02 ` Eli Zaretskii [this message]
2015-11-18 18:10 ` Glenn Morris
2015-11-18 18:19 ` Eli Zaretskii
2015-11-18 18:28 ` Glenn Morris
2015-11-18 18:46 ` Eli Zaretskii
2015-11-18 19:36 ` David Kastrup
2015-11-19 8:35 ` Andreas Schwab
2015-11-19 15:49 ` Eli Zaretskii
2015-11-19 16:35 ` Andreas Schwab
2015-11-19 17:02 ` Eli Zaretskii
2015-11-19 19:48 ` David Engster
2015-11-19 20:38 ` Eli Zaretskii
2015-11-19 20:57 ` David Engster
2015-11-20 0:31 ` Juanma Barranquero
2015-11-20 8:09 ` Eli Zaretskii
2015-11-20 16:38 ` Future release schedules (was: make change-history on non-master branches) John Wiegley
2015-11-20 18:04 ` Eli Zaretskii
2015-11-20 18:15 ` Future release schedules John Wiegley
2015-11-20 18:41 ` Future release schedules (was: make change-history on non-master branches) Artur Malabarba
2015-11-20 18:43 ` Artur Malabarba
2015-11-20 18:49 ` Eli Zaretskii
2015-11-20 19:05 ` Eli Zaretskii
2015-11-20 19:14 ` Future release schedules John Wiegley
2015-11-20 21:16 ` Eli Zaretskii
2015-11-20 21:33 ` John Wiegley
2015-11-21 11:14 ` Eli Zaretskii
2015-11-18 19:22 ` make change-history on non-master branches Eli Zaretskii
2015-11-18 20:38 ` Glenn Morris
2015-12-20 18:53 ` Glenn Morris
2015-12-20 21:21 ` Paul Eggert
2015-12-21 0:30 ` Glenn Morris
2015-12-23 1:12 ` John Wiegley
2015-12-23 7:58 ` Paul Eggert
2016-01-25 16:55 ` Glenn Morris
2016-01-25 17:22 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=831tbqc4pc.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).