all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 20717@debbugs.gnu.org
Subject: bug#20717: attribution of gitmerge.el merged entries in generated	ChangeLog
Date: Mon, 08 Jun 2015 09:52:53 -0400	[thread overview]
Message-ID: <jwvpp56mhp6.fsf-monnier+emacsbugs@gnu.org> (raw)
In-Reply-To: <83h9qlnx5a.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 06 Jun 2015 09:55:45 +0300")

> For commits on "mainline", you can use "git log --first-parent" to
> show only mainline commits, but this will not help you in the case in
> point.

Not only that: it will not always show you what you wanted to see, since
it's much too easy to make a commit where the first parent is not the
previous revision on the trunk but the previous revision in your own
local branch instead (and much too hard to avoid this situation).


        Stefan





      parent reply	other threads:[~2015-06-08 13:52 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
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 [this message]

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=jwvpp56mhp6.fsf-monnier+emacsbugs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=20717@debbugs.gnu.org \
    --cc=eliz@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.