From: Johannes Sixt <j6t@kdbg.org>
Date: Sun, 20 Mar 2022 08:05:45 GMT
Subject: Re: using oldest date when squashing commits
Message-ID: <9fae5292-d58f-95da-245b-6e205383cb50@kdbg.org>
In-Reply-To: <YjXRM5HiRizZ035p@ugly>

Am 19.03.22 um 13:48 schrieb Oswald Buddenhagen:
> during interactive rebasing, i sometimes find it necessary to move a
> hunk from one commit to a later one in the branch. now, if that hunk
> cannot be re-ordered with the later commit due to conflicting with it,
> it becomes necessary to squash the later commit onto a temporary commit
> created from the extracted hunk, not the other way around (or using a
> stash). unfortunately, this causes the author date of the later commit
> to be reset, which can rather seriously falsify the date if the branch
> is long-lived.

You want `fixup -C` in the todo-list. See the hints near the end of the
todo-list.

-- Hannes