git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Philip Oakley <philipoakley@iee.org>
To: Junio C Hamano <gitster@pobox.com>,
	Peter Krefting <peter@softwolves.pp.se>
Cc: Jeff Schwartz <jefftschwartz@gmail.com>,
	git@vger.kernel.org, Philip Oakley <philipoakley@iee.org>
Subject: Re: Request to add option to interactive rebase to preserve latest commit date
Date: Fri, 10 May 2019 17:57:35 +0100	[thread overview]
Message-ID: <412f07c2-3ab2-0902-89bd-21e8fe8dc190@iee.org> (raw)
In-Reply-To: <xmqqtve6nbfv.fsf@gitster-ct.c.googlers.com>

On 07/05/2019 05:19, Junio C Hamano wrote:
> The principle is "the bulk of the work was done in A, no matter what
> is done incrementally by squashing in or amending small refinements;
> the primary authorship date and time stays the same as the original".
>
> When the person who is correcting other's change with --amend makes
> a contribution that is substantial enough such that the amended HEAD
> no longer resembles the original HEAD, there is a mechanism to let
> the amender take authorship,
IIUC the effective change in authorship was noted in another thread 
about a perceived problem in rebase, and it just bit me as well recently 
(and the Github PR bot rejected my series for a mismatched 
author/sign-off :-(.

If a commit is edited in a `rebase -i` then I think the same can happen, 
resulting in the same user surprise at the change. Possibly a simple 
documentation note may help reduce user surprise.
> i.e. do this at the last step instead
>
> 	$ git commit --reset-author --amend -a
>
> in the second sequence.  I do not think there currently is an
> equivalent in "rebase -i" language to do so.
--
Philip

      parent reply	other threads:[~2019-05-10 16:57 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-25 13:00 Request to add option to interactive rebase to preserve latest commit date Jeff Schwartz
2019-04-26 14:32 ` Junio C Hamano
2019-05-01  8:52   ` Peter Krefting
2019-05-07  4:19     ` Junio C Hamano
2019-05-07  5:45       ` Peter Krefting
2019-05-07 10:52         ` Jeff Schwartz
2019-05-10 16:57       ` Philip Oakley [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

  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=412f07c2-3ab2-0902-89bd-21e8fe8dc190@iee.org \
    --to=philipoakley@iee.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jefftschwartz@gmail.com \
    --cc=peter@softwolves.pp.se \
    /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).