Richard Stephens

(replying to Kanbaru 🌟 (one hikari of too many))

@hikari Instead of actually squashing, generate an empty commit with metadata that indicates "treat the past 7 commits as one squashed commit". Even better, bisect, could know to jump between only squashed commits.

1 replies →
1 replies

Kanbaru 🌟 (one hikari of too many)

(replying to Richard Stephens)

@richardstephens honestly it sounds to me like what you want are actual merges

Richard Stephens

(replying to Richard Stephens)

@hikari You could also make an "amended" commit actually a branch that's hidden from most of the UI. Both of these solutions would be backwards compatible too, although I freely admit to not having thought through all the implications.