From: Glenn Morris <rgm@gnu.org>
To: 20717@debbugs.gnu.org
Subject: bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog
Date: Fri, 05 Jun 2015 18:06:49 -0400 [thread overview]
Message-ID: <fm4mml4xom.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <ytmw0iaaul.fsf@fencepost.gnu.org> (Glenn Morris's message of "Tue, 02 Jun 2015 02:22:10 -0400")
Glenn Morris wrote:
> After using M-x gitmerge (which seems v nice, BTW), 'make ChangeLog'
> creates a file with contents:
>
> 2015-06-01 Glenn Morris <rgm@...>
>
> Merge from origin/emacs-24
> 8b5f2f4 * doc/emacs/emacs.texi: Update the ISBN of the Emacs manual.
>
> The merged entries should be listed under the name of the original
> author(s), not the name of the person who did the merge.
Oh, I see we actually get both. The above entry on the date of the
merge, and another entry (with the correct attribution) on the date the
change was originally made (which of course has zero relation to the
merge date) in the original branch. And changes that were skipped from
the merge are still included. What a confusing mess.
next prev parent reply other threads:[~2015-06-05 22:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 6:22 bug#20717: attribution of gitmerge.el merged entries in generated ChangeLog Glenn Morris
2015-06-05 22:06 ` Glenn Morris [this message]
2015-06-06 6:55 ` Eli Zaretskii
2015-06-06 18:13 ` Glenn Morris
2015-06-06 18:48 ` Glenn Morris
2015-06-06 19:32 ` Eli Zaretskii
2015-06-11 1:28 ` Glenn Morris
2015-06-11 1:41 ` Glenn Morris
2017-12-23 2:57 ` Glenn Morris
2015-06-11 2:46 ` Eli Zaretskii
2015-06-08 13:52 ` Stefan Monnier
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fm4mml4xom.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=20717@debbugs.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.