From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: kristofferhaugsbakk@fastmail.com, j6t@kdbg.org,
Kristoffer Haugsbakk <code@khaugsbakk.name>,
git@vger.kernel.org, phillip.wood@dunelm.org.uk
Subject: Re: [PATCH] doc: warn against --committer-date-is-author-date
Date: Thu, 09 Oct 2025 14:41:47 -0700 [thread overview]
Message-ID: <xmqqo6qfda78.fsf@gitster.g> (raw)
In-Reply-To: <3a8dfd13-982d-4c83-b675-1e9a63bb6ab0@gmail.com> (Phillip Wood's message of "Thu, 9 Oct 2025 14:46:41 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
>> You should only use
>> + this option to lie about the committer date when applying
>
> s/lie/override/ ?
It cannot be "fixing an earlier mistake by overriding the correct
data". It is deliberately using a data that does not match the
reality to replace what was recorded, so in this case, "lie" would
be the proper characterization, I would think.
>> --committer-date-is-author-date::
>> - Instead of using the current time as the committer date, use
>> - the author date of the commit being rebased as the committer
>> - date. This option implies `--force-rebase`.
>> + NOTE: The history walking machinery assumes that commits have
>> + strictly increasing commit timestamps, with some tolerance for
>> + clock skew (see linkgit:git-rev-list[1]). You should only use
>> + this option to lie about the committer date when applying
>> + commits on top of a base which commit is older (in terms of the
>
> The comments above apply here as well. In addition s/applying
> commits/rebasing commits/ for this command I think.
>
>> + commit date) than the oldest commit you are applying (in
>> + terms of the author date).
>
> We should also warn against using this option when rearranging commits
> with "git rebase -i" as well.
True.
> Thanks for working on this, it is a very good idea to add a warning to
> the documentation for this option. I'm going to be off the list for the
> next 10 days or so, I'll look at any re-roll when I return.
next prev parent reply other threads:[~2025-10-09 21:41 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-28 6:59 How dangerous is --committer-date-is-author-date these days? Johannes Sixt
2024-09-28 9:49 ` Phillip Wood
2024-09-28 10:04 ` Phillip Wood
2024-09-30 14:49 ` Kristoffer Haugsbakk
2024-09-30 17:08 ` Junio C Hamano
2025-10-08 20:41 ` SZEDER Gábor
2025-10-08 19:45 ` [PATCH] doc: warn against --committer-date-is-author-date kristofferhaugsbakk
2025-10-09 13:46 ` Phillip Wood
2025-10-09 14:31 ` Kristoffer Haugsbakk
2025-10-09 20:47 ` Kristoffer Haugsbakk
2025-10-09 21:58 ` Junio C Hamano
2025-10-09 22:56 ` Kristoffer Haugsbakk
2025-10-09 21:41 ` Junio C Hamano [this message]
2025-10-09 21:57 ` Kristoffer Haugsbakk
2025-10-11 9:15 ` Johannes Sixt
2025-10-16 14:13 ` Kristoffer Haugsbakk
2025-10-16 15:12 ` Kristoffer Haugsbakk
2025-10-16 15:28 ` Johannes Sixt
2025-10-16 15:42 ` Kristoffer Haugsbakk
2025-10-16 16:23 ` Junio C Hamano
2025-11-19 16:27 ` Kristoffer Haugsbakk
2025-11-20 16:26 ` [PATCH v2] " kristofferhaugsbakk
2025-11-20 17:19 ` Johannes Sixt
2025-11-26 16:02 ` Phillip Wood
2025-11-27 6:30 ` Kristoffer Haugsbakk
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=xmqqo6qfda78.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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 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.