public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Phillip Wood <phillip.wood123@gmail•com>
To: Johannes Sixt <j6t@kdbg•org>, Junio C Hamano <gitster@pobox•com>,
	Mathias Rav <m@git•strova.dk>
Cc: git@vger•kernel.org, Phillip Wood <phillip.wood@dunelm•org.uk>
Subject: Re: [PATCH] rebase -i: use same commit's message and date with f -C
Date: Wed, 24 Sep 2025 14:48:18 +0100	[thread overview]
Message-ID: <467907a8-06a1-4107-863c-4d0dff0dc9f9@gmail.com> (raw)
In-Reply-To: <0a14a93e-7da2-43e1-9d71-c58a69c7a4af@kdbg.org>

Hi Johannes

On 24/09/2025 09:47, Johannes Sixt wrote:
> 
> The common situation where the proposed change is handy isn't where a
> previous commit is fixed up.
> 
> Sometimes, a previous commit is a fixup for a later one, for example, a
> change slipped into in earlier commit that should go into a later commit
> and has been split off into its own commit. Many times it would be
> sufficient to reorder the commits and be done. However, sometimes (and
> not even infrequently), reordering the commits introduces conflicts that
> do not happen if the order remains. Here, we want the proposed feature.

Thanks for explaining that. I had not realized from the commit message 
that an important aspect was keeping the commits in order to avoid 
conflicts.

> Since your argument hinges on the word and meaning of "fixup" (which I
> can buy somewhat), we could extend "squash" with an option that
> specifies which commit supplies the date and authorship metadata.

Or possibly a different option to "fixup" like "--use-author"

Thanks

Phillip

next prev parent reply	other threads:[~2025-09-24 13:48 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-23  8:55 [PATCH] rebase -i: use same commit's message and date with f -C Mathias Rav
2025-09-23  9:21 ` Karthik Nayak
2025-09-23 15:23 ` Phillip Wood
2025-09-23 17:10 ` Ben Knoble
2025-09-23 17:37 ` Kristoffer Haugsbakk
2025-09-23 21:38 ` Junio C Hamano
2025-09-24  8:47   ` Johannes Sixt
2025-09-24 13:48     ` Phillip Wood [this message]
2025-09-24 15:21     ` Mathias Rav
2025-09-25 10:11       ` Phillip Wood
2025-09-25 17:08         ` Junio C Hamano
2025-09-24 16:54 ` Oswald Buddenhagen
2025-09-24 20:48   ` Junio C Hamano
2025-09-25 10:08     ` Phillip Wood

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=467907a8-06a1-4107-863c-4d0dff0dc9f9@gmail.com \
    --to=phillip.wood123@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    --cc=j6t@kdbg$(echo .)org \
    --cc=m@git$(echo .)strova.dk \
    --cc=phillip.wood@dunelm$(echo .)org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox