Thread (6 messages) 6 messages, 3 authors, 2023-10-24

Re: using oldest date when squashing commits

From: Johannes Sixt <hidden>
Date: 2022-03-20 08:05:51

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help