From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: Marc Branchaud <marcnarc@xiplink.com>
Cc: Johannes Sixt <j6t@kdbg.org>, Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood123@gmail.com>,
phillip.wood@dunelm.org.uk, git@vger.kernel.org
Subject: Re: using oldest date when squashing commits
Date: Fri, 27 Oct 2023 14:45:35 +0200 [thread overview]
Message-ID: <ZTuw7ziOnTunMmML@ugly> (raw)
In-Reply-To: <70b8d4d8-f4b5-4cd7-b73a-1d7393d84266@xiplink.com>
On Fri, Oct 27, 2023 at 08:34:40AM -0400, Marc Branchaud wrote:
>I never use "fixup -C" (or -c), but I do use squash/fixup a lot. I
>find that I would prefer it if Git used the most recent Author date
>from the set of commits being combined, rather than preserving the
>picked commit's Author date.
>
that would be unreliable, as plain amends wouldn't be reflected. that
may be rare in your workflow, but still.
>Sometimes it takes quite a while for me to get a piece of work sorted
>out, and I would rather have the Author date in the end-result commit
>reflect the work's completion time than its initiation time.
>
afaict, you need to get used to `--amend --reset-author` all commits
before you push to achieve this reliably. that can be easily automated
by using -x with rebase -i (filter-repo (ex filter-branch) would also
work).
regards
next prev parent reply other threads:[~2023-10-27 12:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-19 12:48 using oldest date when squashing commits Oswald Buddenhagen
2022-03-20 8:05 ` Johannes Sixt
2022-03-20 10:53 ` Oswald Buddenhagen
2023-10-24 9:26 ` Phillip Wood
2023-10-24 10:18 ` Oswald Buddenhagen
2023-10-24 14:00 ` Phillip Wood
2023-10-24 17:30 ` Junio C Hamano
2023-10-24 20:13 ` Oswald Buddenhagen
2023-10-24 21:19 ` Johannes Sixt
2023-10-27 12:34 ` Marc Branchaud
2023-10-27 12:45 ` Oswald Buddenhagen [this message]
2023-10-27 13:20 ` Marc Branchaud
2023-10-27 13:26 ` Oswald Buddenhagen
2023-10-27 13:46 ` Marc Branchaud
2023-10-27 23:24 ` Junio C Hamano
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=ZTuw7ziOnTunMmML@ugly \
--to=oswald.buddenhagen@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=marcnarc@xiplink.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 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).