From: David Glasser <glasser@davidglasser.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: Keep original author with git merge --squash?
Date: Thu, 12 Feb 2015 14:19:24 -0800 [thread overview]
Message-ID: <CAN7QDo+OnMUXtj7rYqxAT+pMMVyCrySqxn4vtwvFY+kD2WEvLQ@mail.gmail.com> (raw)
In-Reply-To: <CAN7QDoJ+hOFqoc54sAbLeSxvj8TQKQRSVKbNQXZYfPv1uOy=WA@mail.gmail.com>
On Thu, Feb 12, 2015 at 2:16 PM, David Glasser <glasser@davidglasser.net> wrote:
> - Before invoking prepare-commit-msg, all of the `Author:` lines found
> in SQUASH_MSG have the same value
OK, and to be very specific: I'm just proposing "literally the same
text written after Author"; using mailmap to detect that multiple
different Author lines are actually the same author could be a
potential later improvement.
--
glasser@davidglasser.net | langtonlabs.org | flickr.com/photos/glasser/
next prev parent reply other threads:[~2015-02-12 22:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-11 17:21 Keep original author with git merge --squash? David Glasser
2015-02-12 9:28 ` Jeff King
2015-02-12 11:35 ` Michael Haggerty
2015-02-12 12:12 ` Jeff King
2015-02-12 18:42 ` David Glasser
2015-02-12 20:18 ` Junio C Hamano
2015-02-12 20:53 ` David Glasser
2015-02-12 21:23 ` Junio C Hamano
2015-02-12 22:16 ` David Glasser
2015-02-12 22:19 ` David Glasser [this message]
2015-02-12 22:34 ` Junio C Hamano
2015-02-12 22:50 ` Jeff King
2015-02-12 23:32 ` Junio C Hamano
2015-02-13 7:10 ` Jeff King
2015-02-13 19:30 ` Junio C Hamano
2015-02-13 19:55 ` Jeff King
2015-02-13 0:17 ` David Glasser
2015-02-13 0:21 ` David Glasser
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=CAN7QDo+OnMUXtj7rYqxAT+pMMVyCrySqxn4vtwvFY+kD2WEvLQ@mail.gmail.com \
--to=glasser@davidglasser.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).