git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: Yann Droneaud <ydroneaud@opteya.com>, git@vger.kernel.org
Subject: Re: git merge --date --author
Date: Fri, 07 Mar 2014 11:43:16 -0800	[thread overview]
Message-ID: <xmqqvbvpu757.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <87y50mxj0b.fsf@igel.home> (Andreas Schwab's message of "Fri, 07 Mar 2014 13:58:44 +0100")

Andreas Schwab <schwab@linux-m68k.org> writes:

> Yann Droneaud <ydroneaud@opteya.com> writes:
>
>> But I'd like to know if there's a specific reason for git merge to not
>> support --date and --author ?
>
> It's rather unusual that a merge is performed on behalf of a different
> author.

Yes.  Michael's "Nobody bothered to implement it" is also correct
but the reason why nobody bothered to most likely is due to "why
would you want to lie?".

If the use case is to rebuild history, you would need to be able to
also lie about the committer, so

>> git merge \
>>     --date "2013-12-31 23:59:59 +0000" \
>>     --author "Happy New Year <happy.new-year@gregorian.calendar>" \
>>     current-year

in such a history-rebuild script would not be sufficient.  The
script can set necessary environment variables to lie about both
author and commiter, though, of course.

  reply	other threads:[~2014-03-07 19:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-07 10:30 git merge --date --author Yann Droneaud
2014-03-07 11:41 ` Michael Haggerty
2014-03-07 12:58 ` Andreas Schwab
2014-03-07 19:43   ` Junio C Hamano [this message]
2014-03-10 12:52     ` Yann Droneaud

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: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqvbvpu757.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=schwab@linux-m68k.org \
    --cc=ydroneaud@opteya.com \
    /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://80x24.org/mirrors/git.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).