Re: [PATCH] rebase -i: use same commit's message and date with f -C

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Sep 24, 2025, 13:48 UTC
Message-ID: <467907a8-06a1-4107-863c-4d0dff0dc9f9@gmail.com>
In-Reply-To: <0a14a93e-7da2-43e1-9d71-c58a69c7a4af@kdbg.org>

Hi Johannes

On 24/09/2025 09:47, Johannes Sixt wrote:

Show 10 quoted lines

> 
> 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